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 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1159 // Our base class RenderWidgetHost needs to reset some stuff. | 1159 // Our base class RenderWidgetHost needs to reset some stuff. |
1160 RendererExited(render_view_termination_status_, exit_code); | 1160 RendererExited(render_view_termination_status_, exit_code); |
1161 | 1161 |
1162 delegate_->RenderViewGone(this, | 1162 delegate_->RenderViewGone(this, |
1163 static_cast<base::TerminationStatus>(status), | 1163 static_cast<base::TerminationStatus>(status), |
1164 exit_code); | 1164 exit_code); |
1165 } | 1165 } |
1166 | 1166 |
1167 void RenderViewHostImpl::OnMsgDidStartProvisionalLoadForFrame( | 1167 void RenderViewHostImpl::OnMsgDidStartProvisionalLoadForFrame( |
1168 int64 frame_id, | 1168 int64 frame_id, |
| 1169 int64 parent_frame_id, |
1169 bool is_main_frame, | 1170 bool is_main_frame, |
1170 const GURL& opener_url, | 1171 const GURL& opener_url, |
1171 const GURL& url) { | 1172 const GURL& url) { |
1172 delegate_->DidStartProvisionalLoadForFrame( | 1173 delegate_->DidStartProvisionalLoadForFrame( |
1173 this, frame_id, is_main_frame, opener_url, url); | 1174 this, frame_id, parent_frame_id, is_main_frame, opener_url, url); |
1174 } | 1175 } |
1175 | 1176 |
1176 void RenderViewHostImpl::OnMsgDidRedirectProvisionalLoad( | 1177 void RenderViewHostImpl::OnMsgDidRedirectProvisionalLoad( |
1177 int32 page_id, | 1178 int32 page_id, |
1178 const GURL& opener_url, | 1179 const GURL& opener_url, |
1179 const GURL& source_url, | 1180 const GURL& source_url, |
1180 const GURL& target_url) { | 1181 const GURL& target_url) { |
1181 delegate_->DidRedirectProvisionalLoad( | 1182 delegate_->DidRedirectProvisionalLoad( |
1182 this, page_id, opener_url, source_url, target_url); | 1183 this, page_id, opener_url, source_url, target_url); |
1183 } | 1184 } |
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2011 is_waiting_for_beforeunload_ack_ = false; | 2012 is_waiting_for_beforeunload_ack_ = false; |
2012 is_waiting_for_unload_ack_ = false; | 2013 is_waiting_for_unload_ack_ = false; |
2013 has_timed_out_on_unload_ = false; | 2014 has_timed_out_on_unload_ = false; |
2014 } | 2015 } |
2015 | 2016 |
2016 void RenderViewHostImpl::ClearPowerSaveBlockers() { | 2017 void RenderViewHostImpl::ClearPowerSaveBlockers() { |
2017 STLDeleteValues(&power_save_blockers_); | 2018 STLDeleteValues(&power_save_blockers_); |
2018 } | 2019 } |
2019 | 2020 |
2020 } // namespace content | 2021 } // namespace content |
OLD | NEW |