| 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 unload_ack_is_for_cross_site_transition_(false), | 167 unload_ack_is_for_cross_site_transition_(false), |
| 168 are_javascript_messages_suppressed_(false), | 168 are_javascript_messages_suppressed_(false), |
| 169 sudden_termination_allowed_(false), | 169 sudden_termination_allowed_(false), |
| 170 session_storage_namespace_( | 170 session_storage_namespace_( |
| 171 static_cast<SessionStorageNamespaceImpl*>(session_storage)), | 171 static_cast<SessionStorageNamespaceImpl*>(session_storage)), |
| 172 save_accessibility_tree_for_testing_(false), | 172 save_accessibility_tree_for_testing_(false), |
| 173 send_accessibility_updated_notifications_(false), | 173 send_accessibility_updated_notifications_(false), |
| 174 render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) { | 174 render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) { |
| 175 if (!session_storage_namespace_) { | 175 if (!session_storage_namespace_) { |
| 176 DOMStorageContext* dom_storage_context = | 176 DOMStorageContext* dom_storage_context = |
| 177 BrowserContext::GetDOMStorageContext(GetProcess()->GetBrowserContext()); | 177 BrowserContext::GetDOMStorageContext(GetProcess()->GetBrowserContext(), |
| 178 instance->GetProcess()->GetID()); |
| 178 session_storage_namespace_ = new SessionStorageNamespaceImpl( | 179 session_storage_namespace_ = new SessionStorageNamespaceImpl( |
| 179 static_cast<DOMStorageContextImpl*>(dom_storage_context)); | 180 static_cast<DOMStorageContextImpl*>(dom_storage_context)); |
| 180 } | 181 } |
| 181 | 182 |
| 182 DCHECK(instance_); | 183 DCHECK(instance_); |
| 183 CHECK(delegate_); // http://crbug.com/82827 | 184 CHECK(delegate_); // http://crbug.com/82827 |
| 184 | 185 |
| 185 GetProcess()->EnableSendQueue(); | 186 GetProcess()->EnableSendQueue(); |
| 186 | 187 |
| 187 content::GetContentClient()->browser()->RenderViewHostCreated(this); | 188 content::GetContentClient()->browser()->RenderViewHostCreated(this); |
| (...skipping 1667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1855 // can cause navigations to be ignored in OnMsgNavigate. | 1856 // can cause navigations to be ignored in OnMsgNavigate. |
| 1856 is_waiting_for_beforeunload_ack_ = false; | 1857 is_waiting_for_beforeunload_ack_ = false; |
| 1857 is_waiting_for_unload_ack_ = false; | 1858 is_waiting_for_unload_ack_ = false; |
| 1858 } | 1859 } |
| 1859 | 1860 |
| 1860 void RenderViewHostImpl::ClearPowerSaveBlockers() { | 1861 void RenderViewHostImpl::ClearPowerSaveBlockers() { |
| 1861 STLDeleteValues(&power_save_blockers_); | 1862 STLDeleteValues(&power_save_blockers_); |
| 1862 } | 1863 } |
| 1863 | 1864 |
| 1864 } // namespace content | 1865 } // namespace content |
| OLD | NEW |