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

Side by Side Diff: content/browser/frame_host/render_frame_host_factory.cc

Issue 851333005: Revert of Make RenderFrame(Host) own a RenderWidget(Host). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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 RenderViewHostImpl* render_view_host, 18 RenderViewHostImpl* render_view_host,
19 RenderFrameHostDelegate* delegate, 19 RenderFrameHostDelegate* delegate,
20 RenderWidgetHostDelegate* rwh_delegate,
21 FrameTree* frame_tree, 20 FrameTree* frame_tree,
22 FrameTreeNode* frame_tree_node, 21 FrameTreeNode* frame_tree_node,
23 int routing_id, 22 int routing_id,
24 int flags) { 23 int flags) {
25 if (factory_) { 24 if (factory_) {
26 return factory_->CreateRenderFrameHost( 25 return factory_->CreateRenderFrameHost(render_view_host, delegate,
27 render_view_host, delegate, rwh_delegate, frame_tree, frame_tree_node, 26 frame_tree, frame_tree_node,
28 routing_id, flags); 27 routing_id, flags).Pass();
29 } 28 }
30 return make_scoped_ptr( 29 return make_scoped_ptr(new RenderFrameHostImpl(render_view_host, delegate,
31 new RenderFrameHostImpl(render_view_host, delegate, rwh_delegate, 30 frame_tree, frame_tree_node,
32 frame_tree, frame_tree_node, routing_id, flags)); 31 routing_id, flags));
33 } 32 }
34 33
35 // static 34 // static
36 void RenderFrameHostFactory::RegisterFactory(RenderFrameHostFactory* factory) { 35 void RenderFrameHostFactory::RegisterFactory(RenderFrameHostFactory* factory) {
37 DCHECK(!factory_) << "Can't register two factories at once."; 36 DCHECK(!factory_) << "Can't register two factories at once.";
38 factory_ = factory; 37 factory_ = factory;
39 } 38 }
40 39
41 // static 40 // static
42 void RenderFrameHostFactory::UnregisterFactory() { 41 void RenderFrameHostFactory::UnregisterFactory() {
43 DCHECK(factory_) << "No factory to unregister."; 42 DCHECK(factory_) << "No factory to unregister.";
44 factory_ = NULL; 43 factory_ = NULL;
45 } 44 }
46 45
47 } // namespace content 46 } // 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