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

Side by Side 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, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_host_factory.h" 5 #include "content/browser/frame_host/render_frame_host_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/frame_host/frame_tree_node.h" 8 #include "content/browser/frame_host/frame_tree_node.h"
9 #include "content/browser/frame_host/render_frame_host_impl.h" 9 #include "content/browser/frame_host/render_frame_host_impl.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 // static 13 // static
14 RenderFrameHostFactory* RenderFrameHostFactory::factory_ = NULL; 14 RenderFrameHostFactory* RenderFrameHostFactory::factory_ = NULL;
15 15
16 // static 16 // static
17 scoped_ptr<RenderFrameHostImpl> RenderFrameHostFactory::Create( 17 scoped_ptr<RenderFrameHostImpl> RenderFrameHostFactory::Create(
18 SiteInstance* site_instance,
18 RenderViewHostImpl* render_view_host, 19 RenderViewHostImpl* render_view_host,
19 RenderFrameHostDelegate* delegate, 20 RenderFrameHostDelegate* delegate,
20 RenderWidgetHostDelegate* rwh_delegate, 21 RenderWidgetHostDelegate* rwh_delegate,
21 FrameTree* frame_tree, 22 FrameTree* frame_tree,
22 FrameTreeNode* frame_tree_node, 23 FrameTreeNode* frame_tree_node,
23 int routing_id, 24 int routing_id,
24 int flags) { 25 int flags) {
25 if (factory_) { 26 if (factory_) {
26 return factory_->CreateRenderFrameHost( 27 return factory_->CreateRenderFrameHost(site_instance, render_view_host,
27 render_view_host, delegate, rwh_delegate, frame_tree, frame_tree_node, 28 delegate, rwh_delegate, frame_tree,
28 routing_id, flags); 29 frame_tree_node, routing_id, flags);
29 } 30 }
30 return make_scoped_ptr( 31 return make_scoped_ptr(new RenderFrameHostImpl(
31 new RenderFrameHostImpl(render_view_host, delegate, rwh_delegate, 32 site_instance, render_view_host, delegate, rwh_delegate, frame_tree,
32 frame_tree, frame_tree_node, routing_id, flags)); 33 frame_tree_node, routing_id, flags));
33 } 34 }
34 35
35 // static 36 // static
36 void RenderFrameHostFactory::RegisterFactory(RenderFrameHostFactory* factory) { 37 void RenderFrameHostFactory::RegisterFactory(RenderFrameHostFactory* factory) {
37 DCHECK(!factory_) << "Can't register two factories at once."; 38 DCHECK(!factory_) << "Can't register two factories at once.";
38 factory_ = factory; 39 factory_ = factory;
39 } 40 }
40 41
41 // static 42 // static
42 void RenderFrameHostFactory::UnregisterFactory() { 43 void RenderFrameHostFactory::UnregisterFactory() {
43 DCHECK(factory_) << "No factory to unregister."; 44 DCHECK(factory_) << "No factory to unregister.";
44 factory_ = NULL; 45 factory_ = NULL;
45 } 46 }
46 47
47 } // namespace content 48 } // namespace content
OLDNEW
« 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