Make RenderFrame(Host) own a RenderWidget(Host).

content/browser/frame_host/render_frame_host_impl.cc

 // Copyright 2013 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/frame_host/render_frame_host_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
@@ skipping 725 matching lines @@
   // filenames it can't access in a future session restore.
   if (!render_view_host_->CanAccessFilesOfPageState(
           validated_params.page_state)) {
     GetProcess()->ReceivedBadMessage();
     return;
   }
 
   frame_tree_node()->navigator()->DidNavigate(this, validated_params);
 }
 
+void RenderFrameHostImpl::CreateRenderWidgetHost(
+    RenderWidgetHostDelegate* delegate,
+    bool hidden) {
+  DCHECK(!render_widget_host_);
+  int render_widget_host_routing_id = GetProcess()->GetNextRoutingID();
+  render_widget_host_.reset(
+      new RenderWidgetHostImpl(delegate,
+                               GetProcess(),
+                               render_widget_host_routing_id,
+                               hidden));
+
+  new RenderWidgetHostViewChildFrame(render_widget_host_.get());
+
+  Send(new FrameMsg_NewWidgetForFrame(routing_id_,
+                                      render_widget_host_routing_id,
+                                      hidden));
+}
+
 RenderWidgetHostImpl* RenderFrameHostImpl::GetRenderWidgetHost() {
+  if (render_widget_host_)
+    return render_widget_host_.get();
+
+  // TODO(kenrb): When RenderViewHost no longer inherits RenderWidgetHost,
+  // we can remove this fallback. Currently it is only used for the main
+  // frame.
   return static_cast<RenderWidgetHostImpl*>(render_view_host_);
 }
 
 int RenderFrameHostImpl::GetEnabledBindings() {
   return render_view_host_->GetEnabledBindings();
 }
 
 void RenderFrameHostImpl::OnCrossSiteResponse(
     const GlobalRequestID& global_request_id,
     scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request,
@@ skipping 763 matching lines @@
   // Clear any state if a pending navigation is canceled or preempted.
   if (suspended_nav_params_)
     suspended_nav_params_.reset();
 
   TRACE_EVENT_ASYNC_END0("navigation",
                          "RenderFrameHostImpl navigation suspended", this);
   navigations_suspended_ = false;
 }
 
 }  // namespace content