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

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

Issue 1352813006: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed uninitialized variable and missing call to WebUIImpl::RenderViewReused. Created 5 years, 2 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 SiteInstance* site_instance,
19 RenderViewHostImpl* render_view_host, 19 RenderViewHostImpl* render_view_host,
20 RenderFrameHostDelegate* delegate, 20 RenderFrameHostDelegate* delegate,
21 RenderWidgetHostDelegate* rwh_delegate, 21 RenderWidgetHostDelegate* rwh_delegate,
22 FrameTree* frame_tree, 22 FrameTree* frame_tree,
23 FrameTreeNode* frame_tree_node, 23 FrameTreeNode* frame_tree_node,
24 int32 routing_id, 24 int32 routing_id,
25 int32 widget_routing_id, 25 int32 widget_routing_id,
26 int flags) { 26 int flags,
27 const GURL& dest_url,
28 int entry_bindings) {
27 if (factory_) { 29 if (factory_) {
28 return factory_->CreateRenderFrameHost( 30 return factory_->CreateRenderFrameHost(
29 site_instance, render_view_host, delegate, rwh_delegate, frame_tree, 31 site_instance, render_view_host, delegate, rwh_delegate, frame_tree,
30 frame_tree_node, routing_id, widget_routing_id, flags); 32 frame_tree_node, routing_id, widget_routing_id, flags, dest_url,
33 entry_bindings);
31 } 34 }
32 return make_scoped_ptr(new RenderFrameHostImpl( 35 return make_scoped_ptr(new RenderFrameHostImpl(
33 site_instance, render_view_host, delegate, rwh_delegate, frame_tree, 36 site_instance, render_view_host, delegate, rwh_delegate, frame_tree,
34 frame_tree_node, routing_id, widget_routing_id, flags)); 37 frame_tree_node, routing_id, widget_routing_id, flags, dest_url,
38 entry_bindings));
35 } 39 }
36 40
37 // static 41 // static
38 void RenderFrameHostFactory::RegisterFactory(RenderFrameHostFactory* factory) { 42 void RenderFrameHostFactory::RegisterFactory(RenderFrameHostFactory* factory) {
39 DCHECK(!factory_) << "Can't register two factories at once."; 43 DCHECK(!factory_) << "Can't register two factories at once.";
40 factory_ = factory; 44 factory_ = factory;
41 } 45 }
42 46
43 // static 47 // static
44 void RenderFrameHostFactory::UnregisterFactory() { 48 void RenderFrameHostFactory::UnregisterFactory() {
45 DCHECK(factory_) << "No factory to unregister."; 49 DCHECK(factory_) << "No factory to unregister.";
46 factory_ = NULL; 50 factory_ = NULL;
47 } 51 }
48 52
49 } // namespace content 53 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698