OLD | NEW |
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/render_frame_host_impl.h" | 9 #include "content/browser/frame_host/render_frame_host_impl.h" |
9 | 10 |
10 namespace content { | 11 namespace content { |
11 | 12 |
12 // static | 13 // static |
13 RenderFrameHostFactory* RenderFrameHostFactory::factory_ = NULL; | 14 RenderFrameHostFactory* RenderFrameHostFactory::factory_ = NULL; |
14 | 15 |
15 // static | 16 // static |
16 scoped_ptr<RenderFrameHostImpl> RenderFrameHostFactory::Create( | 17 scoped_ptr<RenderFrameHostImpl> RenderFrameHostFactory::Create( |
17 RenderViewHostImpl* render_view_host, | 18 RenderViewHostImpl* render_view_host, |
18 RenderFrameHostDelegate* delegate, | 19 RenderFrameHostDelegate* delegate, |
19 FrameTree* frame_tree, | 20 FrameTree* frame_tree, |
| 21 FrameTreeNode* frame_tree_node, |
20 int routing_id, | 22 int routing_id, |
21 bool is_swapped_out) { | 23 bool is_swapped_out) { |
22 if (factory_) { | 24 if (factory_) { |
23 return factory_->CreateRenderFrameHost(render_view_host, | 25 return factory_->CreateRenderFrameHost(render_view_host, |
24 delegate, | 26 delegate, |
25 frame_tree, | 27 frame_tree, |
| 28 frame_tree_node, |
26 routing_id, | 29 routing_id, |
27 is_swapped_out).Pass(); | 30 is_swapped_out).Pass(); |
28 } | 31 } |
29 return make_scoped_ptr(new RenderFrameHostImpl( | 32 return make_scoped_ptr(new RenderFrameHostImpl( |
30 render_view_host, delegate, frame_tree, routing_id, is_swapped_out)); | 33 render_view_host, delegate, frame_tree, frame_tree_node, routing_id, |
| 34 is_swapped_out)); |
31 } | 35 } |
32 | 36 |
33 // static | 37 // static |
34 void RenderFrameHostFactory::RegisterFactory(RenderFrameHostFactory* factory) { | 38 void RenderFrameHostFactory::RegisterFactory(RenderFrameHostFactory* factory) { |
35 DCHECK(!factory_) << "Can't register two factories at once."; | 39 DCHECK(!factory_) << "Can't register two factories at once."; |
36 factory_ = factory; | 40 factory_ = factory; |
37 } | 41 } |
38 | 42 |
39 // static | 43 // static |
40 void RenderFrameHostFactory::UnregisterFactory() { | 44 void RenderFrameHostFactory::UnregisterFactory() { |
41 DCHECK(factory_) << "No factory to unregister."; | 45 DCHECK(factory_) << "No factory to unregister."; |
42 factory_ = NULL; | 46 factory_ = NULL; |
43 } | 47 } |
44 | 48 |
45 } // namespace content | 49 } // namespace content |
OLD | NEW |