Move RenderWidgetHost::Init() call up

content/browser/tab_contents/tab_contents_view_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/tab_contents/tab_contents_view_helper.h"
 
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 64 matching lines @@
 
   // Save the created window associated with the route so we can show it later.
   pending_contents_[route_id] = new_contents;
 
   if (web_contents->GetDelegate())
     web_contents->GetDelegate()->WebContentsCreated(web_contents,
                                                     params.opener_frame_id,
                                                     params.target_url,
                                                     new_contents);
 
+  // TODO(brettw): It seems bogus to reach into here and initialize the host.
+  new_contents->GetRenderViewHost()->Init();
   return new_contents;
 }
 
 RenderWidgetHostView* TabContentsViewHelper::CreateNewWidget(
     WebContents* web_contents,
     int route_id,
     bool is_fullscreen,
     WebKit::WebPopupType popup_type) {
   content::RenderProcessHost* process = web_contents->GetRenderProcessHost();
   RenderWidgetHost* widget_host = new RenderWidgetHost(process, route_id);
   RenderWidgetHostView* widget_view =
       RenderWidgetHostView::CreateViewForWidget(widget_host);
   if (!is_fullscreen) {
     // Popups should not get activated.
     widget_view->set_popup_type(popup_type);
   }
   // Save the created widget associated with the route so we can show it later.
   pending_widget_views_[route_id] = widget_view;
+
+  // TODO(jamesr): Check if this is bogus. If it's not, remove the
+  // pending_contents_ stuff.
+  widget_host->Init();
   return widget_view;
 }
 
 TabContents* TabContentsViewHelper::GetCreatedWindow(int route_id) {
   PendingContents::iterator iter = pending_contents_.find(route_id);
 
   // Certain systems can block the creation of new windows. If we didn't succeed
   // in creating one, just return NULL.
   if (iter == pending_contents_.end()) {
     return NULL;
   }
 
   TabContents* new_contents = iter->second;
   pending_contents_.erase(route_id);
 
   if (!new_contents->GetRenderProcessHost()->HasConnection() ||
       !new_contents->GetRenderViewHost()->view())
     return NULL;
 
-  // TODO(brettw): It seems bogus to reach into here and initialize the host.
-  new_contents->GetRenderViewHost()->Init();
   return new_contents;
 }
 
 RenderWidgetHostView* TabContentsViewHelper::GetCreatedWidget(int route_id) {
   PendingWidgetViews::iterator iter = pending_widget_views_.find(route_id);
   if (iter == pending_widget_views_.end()) {
     DCHECK(false);
     return NULL;
   }
 
@@ skipping 36 matching lines @@
   RenderWidgetHostView* widget_host_view = GetCreatedWidget(route_id);
   if (is_fullscreen) {
     widget_host_view->InitAsFullscreen(web_contents->GetRenderWidgetHostView());
   } else {
     widget_host_view->InitAsPopup(web_contents->GetRenderWidgetHostView(),
                                   initial_pos);
   }
   widget_host_view->GetRenderWidgetHost()->Init();
   return widget_host_view;
 }