Removes RenderViewHostDelegate::GetBrowserWindowID. Instead the places

that care send the correct message. This change is motivated by
wanting to remove SessionID from content. At later cl will remove
TabContentsDelegate::RenderViewCreated.

BUG=none
TEST=none
R=jam@chromium.org,mpcomplete@chromium.org

Review URL: http://codereview.chromium.org/7046041

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88376 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_host.cc

@@ -210,6 +210,19 @@ void ExtensionHost::CreateRenderViewSoon(RenderWidgetHostView* host_view) {
 
 void ExtensionHost::CreateRenderViewNow() {
   render_view_host_->CreateRenderView(string16());
+  if (extension_host_type_ == ViewType::EXTENSION_POPUP ||
+      extension_host_type_ == ViewType::EXTENSION_DIALOG ||
+      extension_host_type_ == ViewType::EXTENSION_INFOBAR) {
+    // If the host is bound to a browser, then extract its window id.
+    // Extensions hosted in ExternalTabContainer objects may not have
+    // an associated browser.
+    const Browser* browser = GetBrowser();
+    if (browser && render_view_host_) {
+      render_view_host_->Send(new ExtensionMsg_UpdateBrowserWindowId(
+          render_view_host_->routing_id(),
+          ExtensionTabUtil::GetWindowId(browser)));
+    }
+  }
   NavigateToURL(url_);
   DCHECK(IsRenderViewLive());
   if (is_background_page())
@@ -789,25 +802,6 @@ void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) {
   }
 }
 
-int ExtensionHost::GetBrowserWindowID() const {
-  // Hosts not attached to any browser window have an id of -1.  This includes
-  // those mentioned below, and background pages.
-  int window_id = extension_misc::kUnknownWindowId;
-  if (extension_host_type_ == ViewType::EXTENSION_POPUP ||
-      extension_host_type_ == ViewType::EXTENSION_DIALOG ||
-      extension_host_type_ == ViewType::EXTENSION_INFOBAR) {
-    // If the host is bound to a browser, then extract its window id.
-    // Extensions hosted in ExternalTabContainer objects may not have
-    // an associated browser.
-    const Browser* browser = GetBrowser();
-    if (browser)
-      window_id = ExtensionTabUtil::GetWindowId(browser);
-  } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) {
-    NOTREACHED();
-  }
-  return window_id;
-}
-
 void ExtensionHost::OnRunFileChooser(
     const ViewHostMsg_RunFileChooser_Params& params) {
   if (file_select_helper_.get() == NULL)

chrome/browser/extensions/extension_host.h

@@ -115,7 +115,6 @@ class ExtensionHost : public RenderViewHostDelegate,
   virtual const GURL& GetURL() const;
   virtual void RenderViewCreated(RenderViewHost* render_view_host);
   virtual ViewType::Type GetRenderViewType() const;
-  virtual int GetBrowserWindowID() const;
   virtual void RenderViewGone(RenderViewHost* render_view_host,
                               base::TerminationStatus status,
                               int error_code);

chrome/browser/extensions/extension_message_handler.cc

@@ -33,8 +33,6 @@ bool ExtensionMessageHandler::OnMessageReceived(
 void ExtensionMessageHandler::RenderViewHostInitialized() {
   Send(new ExtensionMsg_NotifyRenderViewType(
       routing_id(), render_view_host()->delegate()->GetRenderViewType()));
-  Send(new ExtensionMsg_UpdateBrowserWindowId(
-      routing_id(), render_view_host()->delegate()->GetBrowserWindowID()));
 }
 
 void ExtensionMessageHandler::OnPostMessage(int port_id,

chrome/browser/notifications/balloon_host.cc

@@ -110,10 +110,6 @@ void BalloonHost::RenderViewGone(RenderViewHost* render_view_host,
   Close(render_view_host);
 }
 
-int BalloonHost::GetBrowserWindowID() const {
-  return extension_misc::kUnknownWindowId;
-}
-
 ViewType::Type BalloonHost::GetRenderViewType() const {
   return ViewType::NOTIFICATION;
 }

chrome/browser/notifications/balloon_host.h

@@ -62,7 +62,6 @@ class BalloonHost : public RenderViewHostDelegate,
                               int error_code);
   virtual void UpdateTitle(RenderViewHost* render_view_host,
                            int32 page_id, const std::wstring& title) {}
-  virtual int GetBrowserWindowID() const;
   virtual ViewType::Type GetRenderViewType() const;
   virtual RenderViewHostDelegate::View* GetViewDelegate();
 

chrome/browser/tab_contents/background_contents.cc

@@ -74,10 +74,6 @@ ViewType::Type BackgroundContents::GetRenderViewType() const {
   return ViewType::BACKGROUND_CONTENTS;
 }
 
-int BackgroundContents::GetBrowserWindowID() const {
-  return extension_misc::kUnknownWindowId;
-}
-
 void BackgroundContents::DidNavigate(
     RenderViewHost* render_view_host,
     const ViewHostMsg_FrameNavigate_Params& params) {

chrome/browser/tab_contents/background_contents.h

@@ -63,7 +63,6 @@ class BackgroundContents : public RenderViewHostDelegate,
   virtual RenderViewHostDelegate::View* GetViewDelegate();
   virtual const GURL& GetURL() const;
   virtual ViewType::Type GetRenderViewType() const;
-  virtual int GetBrowserWindowID() const;
   virtual void DidNavigate(RenderViewHost* render_view_host,
                            const ViewHostMsg_FrameNavigate_Params& params);
   virtual WebPreferences GetWebkitPrefs();

chrome/browser/ui/browser.cc

@@ -2859,6 +2859,7 @@ void Browser::TabInsertedAt(TabContentsWrapper* contents,
 
   // Extension code in the renderer holds the ID of the window that hosts it.
   // Notify it that the window ID changed.
+  // TODO(sky): move this to a better place.
   contents->render_view_host()->Send(new ExtensionMsg_UpdateBrowserWindowId(
       contents->render_view_host()->routing_id(),
       contents->controller().window_id().id()));
@@ -3436,6 +3437,14 @@ content::JavaScriptDialogCreator* Browser::GetJavaScriptDialogCreator() {
   return GetJavaScriptDialogCreatorInstance();
 }
 
+void Browser::RenderViewCreated(TabContents* source, RenderViewHost* host) {
+  // TODO(sky): move this to a TabContentsObserver hung off TabContentsWrapper,
+  // then nuke this method.
+  host->Send(new ExtensionMsg_UpdateBrowserWindowId(
+                 host->routing_id(),
+                 source->controller().window_id().id()));
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, TabContentsWrapperDelegate implementation:
 

chrome/browser/ui/browser.h

@@ -853,6 +853,8 @@ class Browser : public TabHandlerDelegate,
       const MainFrameCommitDetails& details);
   virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator()
       OVERRIDE;
+  virtual void RenderViewCreated(TabContents* source,
+                                 RenderViewHost* host) OVERRIDE;
 
   // Overridden from TabContentsWrapperDelegate:
   virtual void OnDidGetApplicationInfo(TabContentsWrapper* source,

content/browser/renderer_host/render_view_host_delegate.h

@@ -274,10 +274,6 @@ class RenderViewHostDelegate : public IPC::Channel::Listener {
   // object is not a BackgroundContents, returns NULL.
   virtual BackgroundContents* GetAsBackgroundContents();
 
-  // Return id number of browser window which this object is attached to. If no
-  // browser window is attached to, just return -1.
-  virtual int GetBrowserWindowID() const = 0;
-
   // Return type of RenderView which is attached with this object.
   virtual ViewType::Type GetRenderViewType() const = 0;
 

content/browser/renderer_host/render_widget_host.h

@@ -372,7 +372,7 @@ class RenderWidgetHost : public IPC::Channel::Listener,
   // Notification that the user has made some kind of input that could
   // perform an action. See OnUserGesture for more details.
   void StartUserGesture();
-  
+
  protected:
   // Internal implementation of the public Forward*Event() methods.
   void ForwardInputEvent(const WebKit::WebInputEvent& input_event,

content/browser/tab_contents/interstitial_page.cc

@@ -719,10 +719,6 @@ void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply(
     int active_match_ordinal, bool final_update) {
 }
 
-int InterstitialPage::GetBrowserWindowID() const {
-  return tab_->GetBrowserWindowID();
-}
-
 void InterstitialPage::UpdateInspectorSetting(const std::string& key,
                                               const std::string& value) {
   RenderViewHostDelegateHelper::UpdateInspectorSetting(

content/browser/tab_contents/interstitial_page.h

@@ -102,7 +102,6 @@ class InterstitialPage : public NotificationObserver,
   void FocusThroughTabTraversal(bool reverse);
 
   virtual ViewType::Type GetRenderViewType() const;
-  virtual int GetBrowserWindowID() const;
 
   // See description above field.
   void set_reload_on_dont_proceed(bool value) {

content/browser/tab_contents/tab_contents.cc

@@ -1245,10 +1245,6 @@ ViewType::Type TabContents::GetRenderViewType() const {
   return ViewType::TAB_CONTENTS;
 }
 
-int TabContents::GetBrowserWindowID() const {
-  return controller().window_id().id();
-}
-
 void TabContents::RenderViewCreated(RenderViewHost* render_view_host) {
   NotificationService::current()->Notify(
       NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB,
@@ -1273,6 +1269,9 @@ void TabContents::RenderViewCreated(RenderViewHost* render_view_host) {
 
   FOR_EACH_OBSERVER(
       TabContentsObserver, observers_, RenderViewCreated(render_view_host));
+
+  if (delegate())
+    delegate()->RenderViewCreated(this, render_view_host);
 }
 
 void TabContents::RenderViewReady(RenderViewHost* rvh) {

content/browser/tab_contents/tab_contents.h

@@ -626,7 +626,6 @@ class TabContents : public PageNavigator,
       GetRendererManagementDelegate();
   virtual TabContents* GetAsTabContents();
   virtual ViewType::Type GetRenderViewType() const;
-  virtual int GetBrowserWindowID() const;
   virtual void RenderViewCreated(RenderViewHost* render_view_host);
   virtual void RenderViewReady(RenderViewHost* render_view_host);
   virtual void RenderViewGone(RenderViewHost* render_view_host,

content/browser/tab_contents/tab_contents_delegate.cc

@@ -237,5 +237,9 @@ TabContentsDelegate::GetJavaScriptDialogCreator() {
   return JavaScriptDialogCreatorStub::GetInstance();
 }
 
+void TabContentsDelegate::RenderViewCreated(TabContents* source,
+                                            RenderViewHost* host) {
+}
+
 TabContentsDelegate::~TabContentsDelegate() {
 }

content/browser/tab_contents/tab_contents_delegate.h

@@ -308,6 +308,9 @@ class TabContentsDelegate {
   // and displays nothing.
   virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator();
 
+  // Invoked when a new renderer is created.
+  virtual void RenderViewCreated(TabContents* source, RenderViewHost* host);
+
  protected:
   virtual ~TabContentsDelegate();
 };