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