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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 // Be sure to clean up any leftover state from cross-site requests. | 210 // Be sure to clean up any leftover state from cross-site requests. |
211 CrossSiteRequestManager::GetInstance()->SetHasPendingCrossSiteRequest( | 211 CrossSiteRequestManager::GetInstance()->SetHasPendingCrossSiteRequest( |
212 GetProcess()->GetID(), GetRoutingID(), false); | 212 GetProcess()->GetID(), GetRoutingID(), false); |
213 } | 213 } |
214 | 214 |
215 RenderViewHostDelegate* RenderViewHostImpl::GetDelegate() const { | 215 RenderViewHostDelegate* RenderViewHostImpl::GetDelegate() const { |
216 return delegate_; | 216 return delegate_; |
217 } | 217 } |
218 | 218 |
219 SiteInstance* RenderViewHostImpl::GetSiteInstance() const { | 219 SiteInstance* RenderViewHostImpl::GetSiteInstance() const { |
220 return instance_; | 220 return instance_.get(); |
221 } | 221 } |
222 | 222 |
223 bool RenderViewHostImpl::CreateRenderView( | 223 bool RenderViewHostImpl::CreateRenderView( |
224 const string16& frame_name, | 224 const string16& frame_name, |
225 int opener_route_id, | 225 int opener_route_id, |
226 int32 max_page_id) { | 226 int32 max_page_id) { |
227 DCHECK(!IsRenderViewLive()) << "Creating view twice"; | 227 DCHECK(!IsRenderViewLive()) << "Creating view twice"; |
228 | 228 |
229 // The process may (if we're sharing a process with another host that already | 229 // The process may (if we're sharing a process with another host that already |
230 // initialized it) or may not (we have our own process or the old process | 230 // initialized it) or may not (we have our own process or the old process |
(...skipping 1798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2029 is_waiting_for_beforeunload_ack_ = false; | 2029 is_waiting_for_beforeunload_ack_ = false; |
2030 is_waiting_for_unload_ack_ = false; | 2030 is_waiting_for_unload_ack_ = false; |
2031 has_timed_out_on_unload_ = false; | 2031 has_timed_out_on_unload_ = false; |
2032 } | 2032 } |
2033 | 2033 |
2034 void RenderViewHostImpl::ClearPowerSaveBlockers() { | 2034 void RenderViewHostImpl::ClearPowerSaveBlockers() { |
2035 STLDeleteValues(&power_save_blockers_); | 2035 STLDeleteValues(&power_save_blockers_); |
2036 } | 2036 } |
2037 | 2037 |
2038 } // namespace content | 2038 } // namespace content |
OLD | NEW |