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

Side by Side Diff: content/browser/renderer_host/render_view_host_factory.cc

Issue 19491004: Fix SessionStorage confusion between RenderViewHostImpl and NavigationController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer_host/render_view_host_factory.h" 5 #include "content/browser/renderer_host/render_view_host_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/renderer_host/render_view_host_impl.h" 8 #include "content/browser/renderer_host/render_view_host_impl.h"
9 9
10 namespace content { 10 namespace content {
11 11
12 // static 12 // static
13 RenderViewHostFactory* RenderViewHostFactory::factory_ = NULL; 13 RenderViewHostFactory* RenderViewHostFactory::factory_ = NULL;
14 14
15 // static 15 // static
16 RenderViewHost* RenderViewHostFactory::Create( 16 RenderViewHost* RenderViewHostFactory::Create(
17 SiteInstance* instance, 17 SiteInstance* instance,
18 RenderViewHostDelegate* delegate, 18 RenderViewHostDelegate* delegate,
19 RenderWidgetHostDelegate* widget_delegate, 19 RenderWidgetHostDelegate* widget_delegate,
20 int routing_id, 20 int routing_id,
21 int main_frame_routing_id, 21 int main_frame_routing_id,
22 bool swapped_out, 22 bool swapped_out) {
23 SessionStorageNamespace* session_storage_namespace) {
24 if (factory_) { 23 if (factory_) {
25 return factory_->CreateRenderViewHost(instance, delegate, widget_delegate, 24 return factory_->CreateRenderViewHost(instance, delegate, widget_delegate,
26 routing_id, main_frame_routing_id, 25 routing_id, main_frame_routing_id,
27 swapped_out, 26 swapped_out);
28 session_storage_namespace);
29 } 27 }
30 return new RenderViewHostImpl(instance, delegate, widget_delegate, routing_id, 28 return new RenderViewHostImpl(instance, delegate, widget_delegate, routing_id,
31 main_frame_routing_id, swapped_out, 29 main_frame_routing_id, swapped_out);
32 session_storage_namespace);
33 } 30 }
34 31
35 // static 32 // static
36 void RenderViewHostFactory::RegisterFactory(RenderViewHostFactory* factory) { 33 void RenderViewHostFactory::RegisterFactory(RenderViewHostFactory* factory) {
37 DCHECK(!factory_) << "Can't register two factories at once."; 34 DCHECK(!factory_) << "Can't register two factories at once.";
38 factory_ = factory; 35 factory_ = factory;
39 } 36 }
40 37
41 // static 38 // static
42 void RenderViewHostFactory::UnregisterFactory() { 39 void RenderViewHostFactory::UnregisterFactory() {
43 DCHECK(factory_) << "No factory to unregister."; 40 DCHECK(factory_) << "No factory to unregister.";
44 factory_ = NULL; 41 factory_ = NULL;
45 } 42 }
46 43
47 } // namespace content 44 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_factory.h ('k') | content/browser/renderer_host/render_view_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698