Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1327)

Unified Diff: content/browser/frame_host/render_frame_host_factory.cc

Issue 616133002: Make RenderFrame(Host) own a RenderWidget(Host). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test update, RWH lifetime fix Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_factory.cc
diff --git a/content/browser/frame_host/render_frame_host_factory.cc b/content/browser/frame_host/render_frame_host_factory.cc
index 625aa4fba95e8352562657db0013490166b9b275..4d75e0984d307f113f942f782fad5af006ec2efc 100644
--- a/content/browser/frame_host/render_frame_host_factory.cc
+++ b/content/browser/frame_host/render_frame_host_factory.cc
@@ -17,18 +17,19 @@ RenderFrameHostFactory* RenderFrameHostFactory::factory_ = NULL;
scoped_ptr<RenderFrameHostImpl> RenderFrameHostFactory::Create(
RenderViewHostImpl* render_view_host,
RenderFrameHostDelegate* delegate,
+ RenderWidgetHostDelegate* rwh_delegate,
FrameTree* frame_tree,
FrameTreeNode* frame_tree_node,
int routing_id,
int flags) {
if (factory_) {
- return factory_->CreateRenderFrameHost(render_view_host, delegate,
- frame_tree, frame_tree_node,
- routing_id, flags).Pass();
+ return factory_->CreateRenderFrameHost(
+ render_view_host, delegate, rwh_delegate, frame_tree,
nasko 2015/01/14 20:08:04 nit: This doesn't seem right for indent. It should
kenrb 2015/01/15 22:41:46 Done.
+ frame_tree_node, routing_id, flags).Pass();
dcheng 2015/01/14 20:49:02 Drive-by: Pass() should not be needed here (and pr
kenrb 2015/01/15 22:41:46 Done.
}
- return make_scoped_ptr(new RenderFrameHostImpl(render_view_host, delegate,
- frame_tree, frame_tree_node,
- routing_id, flags));
+ return make_scoped_ptr(
+ new RenderFrameHostImpl(render_view_host, delegate, rwh_delegate,
+ frame_tree, frame_tree_node, routing_id, flags));
}
// static

Powered by Google App Engine
This is Rietveld 408576698