OLD | NEW |
---|---|
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 "chrome/browser/background/background_contents.h" | 5 #include "chrome/browser/background/background_contents.h" |
6 | 6 |
7 #include "base/profiler/scoped_tracker.h" | 7 #include "base/profiler/scoped_tracker.h" |
8 #include "chrome/browser/background/background_contents_service.h" | 8 #include "chrome/browser/background/background_contents_service.h" |
9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
10 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" | 10 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" |
(...skipping 26 matching lines...) Expand all Loading... | |
37 content::SessionStorageNamespace* session_storage_namespace) | 37 content::SessionStorageNamespace* session_storage_namespace) |
38 : delegate_(delegate), | 38 : delegate_(delegate), |
39 extension_host_delegate_(extensions::ExtensionsBrowserClient::Get() | 39 extension_host_delegate_(extensions::ExtensionsBrowserClient::Get() |
40 ->CreateExtensionHostDelegate()) { | 40 ->CreateExtensionHostDelegate()) { |
41 profile_ = Profile::FromBrowserContext( | 41 profile_ = Profile::FromBrowserContext( |
42 site_instance->GetBrowserContext()); | 42 site_instance->GetBrowserContext()); |
43 | 43 |
44 WebContents::CreateParams create_params(profile_, site_instance); | 44 WebContents::CreateParams create_params(profile_, site_instance); |
45 create_params.routing_id = routing_id; | 45 create_params.routing_id = routing_id; |
46 create_params.main_frame_routing_id = main_frame_routing_id; | 46 create_params.main_frame_routing_id = main_frame_routing_id; |
47 create_params.renderer_initiated_creation = true; | 47 create_params.renderer_initiated_creation = routing_id != MSG_ROUTING_NONE; |
ncarter (slow)
2015/06/05 21:47:50
What are the (non-test) implications of this fix?
lfg
2015/06/05 22:07:06
In practice, the only issue is that we call the Re
ncarter (slow)
2015/06/05 22:12:08
Thanks for clarifying. Please update the commit me
| |
48 if (session_storage_namespace) { | 48 if (session_storage_namespace) { |
49 content::SessionStorageNamespaceMap session_storage_namespace_map; | 49 content::SessionStorageNamespaceMap session_storage_namespace_map; |
50 session_storage_namespace_map.insert( | 50 session_storage_namespace_map.insert( |
51 std::make_pair(partition_id, session_storage_namespace)); | 51 std::make_pair(partition_id, session_storage_namespace)); |
52 web_contents_.reset(WebContents::CreateWithSessionStorage( | 52 web_contents_.reset(WebContents::CreateWithSessionStorage( |
53 create_params, session_storage_namespace_map)); | 53 create_params, session_storage_namespace_map)); |
54 } else { | 54 } else { |
55 web_contents_.reset(WebContents::Create(create_params)); | 55 web_contents_.reset(WebContents::Create(create_params)); |
56 } | 56 } |
57 extensions::SetViewType( | 57 extensions::SetViewType( |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
212 | 212 |
213 void BackgroundContents::AddDeferredStartRenderHostObserver( | 213 void BackgroundContents::AddDeferredStartRenderHostObserver( |
214 extensions::DeferredStartRenderHostObserver* observer) { | 214 extensions::DeferredStartRenderHostObserver* observer) { |
215 deferred_start_render_host_observer_list_.AddObserver(observer); | 215 deferred_start_render_host_observer_list_.AddObserver(observer); |
216 } | 216 } |
217 | 217 |
218 void BackgroundContents::RemoveDeferredStartRenderHostObserver( | 218 void BackgroundContents::RemoveDeferredStartRenderHostObserver( |
219 extensions::DeferredStartRenderHostObserver* observer) { | 219 extensions::DeferredStartRenderHostObserver* observer) { |
220 deferred_start_render_host_observer_list_.RemoveObserver(observer); | 220 deferred_start_render_host_observer_list_.RemoveObserver(observer); |
221 } | 221 } |
OLD | NEW |