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 "content/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 unload_ack_is_for_cross_site_transition_(false), | 164 unload_ack_is_for_cross_site_transition_(false), |
165 are_javascript_messages_suppressed_(false), | 165 are_javascript_messages_suppressed_(false), |
166 sudden_termination_allowed_(false), | 166 sudden_termination_allowed_(false), |
167 session_storage_namespace_( | 167 session_storage_namespace_( |
168 static_cast<SessionStorageNamespaceImpl*>(session_storage)), | 168 static_cast<SessionStorageNamespaceImpl*>(session_storage)), |
169 save_accessibility_tree_for_testing_(false), | 169 save_accessibility_tree_for_testing_(false), |
170 send_accessibility_updated_notifications_(false), | 170 send_accessibility_updated_notifications_(false), |
171 render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) { | 171 render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) { |
172 if (!session_storage_namespace_) { | 172 if (!session_storage_namespace_) { |
173 DOMStorageContext* dom_storage_context = | 173 DOMStorageContext* dom_storage_context = |
174 BrowserContext::GetDOMStorageContext(GetProcess()->GetBrowserContext()); | 174 BrowserContext::GetDOMStorageContext(GetProcess()->GetBrowserContext(), |
| 175 instance->GetProcess()->GetID()); |
175 session_storage_namespace_ = new SessionStorageNamespaceImpl( | 176 session_storage_namespace_ = new SessionStorageNamespaceImpl( |
176 static_cast<DOMStorageContextImpl*>(dom_storage_context)); | 177 static_cast<DOMStorageContextImpl*>(dom_storage_context)); |
177 } | 178 } |
178 | 179 |
179 DCHECK(instance_); | 180 DCHECK(instance_); |
180 CHECK(delegate_); // http://crbug.com/82827 | 181 CHECK(delegate_); // http://crbug.com/82827 |
181 | 182 |
182 GetProcess()->EnableSendQueue(); | 183 GetProcess()->EnableSendQueue(); |
183 | 184 |
184 content::GetContentClient()->browser()->RenderViewHostCreated(this); | 185 content::GetContentClient()->browser()->RenderViewHostCreated(this); |
(...skipping 1661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1846 // can cause navigations to be ignored in OnMsgNavigate. | 1847 // can cause navigations to be ignored in OnMsgNavigate. |
1847 is_waiting_for_beforeunload_ack_ = false; | 1848 is_waiting_for_beforeunload_ack_ = false; |
1848 is_waiting_for_unload_ack_ = false; | 1849 is_waiting_for_unload_ack_ = false; |
1849 } | 1850 } |
1850 | 1851 |
1851 void RenderViewHostImpl::ClearPowerSaveBlockers() { | 1852 void RenderViewHostImpl::ClearPowerSaveBlockers() { |
1852 STLDeleteValues(&power_save_blockers_); | 1853 STLDeleteValues(&power_save_blockers_); |
1853 } | 1854 } |
1854 | 1855 |
1855 } // namespace content | 1856 } // namespace content |
OLD | NEW |