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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 delegate_->GetRendererPrefs( | 270 delegate_->GetRendererPrefs( |
271 GetProcess()->GetBrowserContext()))); | 271 GetProcess()->GetBrowserContext()))); |
272 } | 272 } |
273 | 273 |
274 void RenderViewHostImpl::Navigate(const ViewMsg_Navigate_Params& params) { | 274 void RenderViewHostImpl::Navigate(const ViewMsg_Navigate_Params& params) { |
275 ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL( | 275 ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL( |
276 GetProcess()->GetID(), params.url); | 276 GetProcess()->GetID(), params.url); |
277 | 277 |
278 ViewMsg_Navigate* nav_message = new ViewMsg_Navigate(GetRoutingID(), params); | 278 ViewMsg_Navigate* nav_message = new ViewMsg_Navigate(GetRoutingID(), params); |
279 | 279 |
| 280 #if defined(OS_CHROMEOS) |
| 281 // crosbug.com/26646. |
| 282 LOG(ERROR) << "Navigation url=" << params.url |
| 283 << ", suspended=" << navigations_suspended_; |
| 284 #endif |
| 285 |
280 // Only send the message if we aren't suspended at the start of a cross-site | 286 // Only send the message if we aren't suspended at the start of a cross-site |
281 // request. | 287 // request. |
282 if (navigations_suspended_) { | 288 if (navigations_suspended_) { |
283 // Shouldn't be possible to have a second navigation while suspended, since | 289 // Shouldn't be possible to have a second navigation while suspended, since |
284 // navigations will only be suspended during a cross-site request. If a | 290 // navigations will only be suspended during a cross-site request. If a |
285 // second navigation occurs, TabContents will cancel this pending RVH | 291 // second navigation occurs, TabContents will cancel this pending RVH |
286 // create a new pending RVH. | 292 // create a new pending RVH. |
287 DCHECK(!suspended_nav_message_.get()); | 293 DCHECK(!suspended_nav_message_.get()); |
288 suspended_nav_message_.reset(nav_message); | 294 suspended_nav_message_.reset(nav_message); |
289 } else { | 295 } else { |
(...skipping 1433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1723 // can cause navigations to be ignored in OnMsgNavigate. | 1729 // can cause navigations to be ignored in OnMsgNavigate. |
1724 is_waiting_for_beforeunload_ack_ = false; | 1730 is_waiting_for_beforeunload_ack_ = false; |
1725 is_waiting_for_unload_ack_ = false; | 1731 is_waiting_for_unload_ack_ = false; |
1726 } | 1732 } |
1727 | 1733 |
1728 void RenderViewHostImpl::ClearPowerSaveBlockers() { | 1734 void RenderViewHostImpl::ClearPowerSaveBlockers() { |
1729 STLDeleteValues(&power_save_blockers_); | 1735 STLDeleteValues(&power_save_blockers_); |
1730 } | 1736 } |
1731 | 1737 |
1732 } // namespace content | 1738 } // namespace content |
OLD | NEW |