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

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

Issue 881683002: Remove indirection for SiteInstance and RenderProcessHost from RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes based on Charlie's review 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 7c224d214b9070613e0c6a6fe0ed2a6e7cb92658..412073aa8bb14b396af4ea87cdfc2acf17edbb87 100644
--- a/content/browser/frame_host/render_frame_host_factory.cc
+++ b/content/browser/frame_host/render_frame_host_factory.cc
@@ -15,6 +15,7 @@ RenderFrameHostFactory* RenderFrameHostFactory::factory_ = NULL;
// static
scoped_ptr<RenderFrameHostImpl> RenderFrameHostFactory::Create(
+ SiteInstance* site_instance,
RenderViewHostImpl* render_view_host,
RenderFrameHostDelegate* delegate,
RenderWidgetHostDelegate* rwh_delegate,
@@ -23,13 +24,13 @@ scoped_ptr<RenderFrameHostImpl> RenderFrameHostFactory::Create(
int routing_id,
int flags) {
if (factory_) {
- return factory_->CreateRenderFrameHost(
- render_view_host, delegate, rwh_delegate, frame_tree, frame_tree_node,
- routing_id, flags);
+ return factory_->CreateRenderFrameHost(site_instance, render_view_host,
+ delegate, rwh_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));
+ return make_scoped_ptr(new RenderFrameHostImpl(
+ site_instance, render_view_host, delegate, rwh_delegate, frame_tree,
+ frame_tree_node, routing_id, flags));
}
// static
« no previous file with comments | « content/browser/frame_host/render_frame_host_factory.h ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698