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

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

Issue 1359163005: Remove surface_id from RenderWidget/RenderWidgetHost and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@channel_creation_preempt
Patch Set: fix more tests 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 int32 surface_id,
27 int flags) { 26 int flags) {
28 if (factory_) { 27 if (factory_) {
29 return factory_->CreateRenderFrameHost( 28 return factory_->CreateRenderFrameHost(
30 site_instance, render_view_host, delegate, rwh_delegate, frame_tree, 29 site_instance, render_view_host, delegate, rwh_delegate, frame_tree,
31 frame_tree_node, routing_id, widget_routing_id, surface_id, flags); 30 frame_tree_node, routing_id, widget_routing_id, flags);
32 } 31 }
33 return make_scoped_ptr(new RenderFrameHostImpl( 32 return make_scoped_ptr(new RenderFrameHostImpl(
34 site_instance, render_view_host, delegate, rwh_delegate, frame_tree, 33 site_instance, render_view_host, delegate, rwh_delegate, frame_tree,
35 frame_tree_node, routing_id, widget_routing_id, surface_id, flags)); 34 frame_tree_node, routing_id, widget_routing_id, flags));
36 } 35 }
37 36
38 // static 37 // static
39 void RenderFrameHostFactory::RegisterFactory(RenderFrameHostFactory* factory) { 38 void RenderFrameHostFactory::RegisterFactory(RenderFrameHostFactory* factory) {
40 DCHECK(!factory_) << "Can't register two factories at once."; 39 DCHECK(!factory_) << "Can't register two factories at once.";
41 factory_ = factory; 40 factory_ = factory;
42 } 41 }
43 42
44 // static 43 // static
45 void RenderFrameHostFactory::UnregisterFactory() { 44 void RenderFrameHostFactory::UnregisterFactory() {
46 DCHECK(factory_) << "No factory to unregister."; 45 DCHECK(factory_) << "No factory to unregister.";
47 factory_ = NULL; 46 factory_ = NULL;
48 } 47 }
49 48
50 } // namespace content 49 } // 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