Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 9709001: Remove/add log for timeout issue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/pyautolib/pyauto.py ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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)
DaveMoore 2012/03/15 02:15:42 Nit: missing bug #
281 LOG(ERROR) << "Navigation url=" << params.url
282 << ", suspended=" << navigations_suspended_;
283 #endif
284
280 // Only send the message if we aren't suspended at the start of a cross-site 285 // Only send the message if we aren't suspended at the start of a cross-site
281 // request. 286 // request.
282 if (navigations_suspended_) { 287 if (navigations_suspended_) {
283 // Shouldn't be possible to have a second navigation while suspended, since 288 // 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 289 // navigations will only be suspended during a cross-site request. If a
285 // second navigation occurs, TabContents will cancel this pending RVH 290 // second navigation occurs, TabContents will cancel this pending RVH
286 // create a new pending RVH. 291 // create a new pending RVH.
287 DCHECK(!suspended_nav_message_.get()); 292 DCHECK(!suspended_nav_message_.get());
288 suspended_nav_message_.reset(nav_message); 293 suspended_nav_message_.reset(nav_message);
289 } else { 294 } else {
(...skipping 1433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1723 // can cause navigations to be ignored in OnMsgNavigate. 1728 // can cause navigations to be ignored in OnMsgNavigate.
1724 is_waiting_for_beforeunload_ack_ = false; 1729 is_waiting_for_beforeunload_ack_ = false;
1725 is_waiting_for_unload_ack_ = false; 1730 is_waiting_for_unload_ack_ = false;
1726 } 1731 }
1727 1732
1728 void RenderViewHostImpl::ClearPowerSaveBlockers() { 1733 void RenderViewHostImpl::ClearPowerSaveBlockers() {
1729 STLDeleteValues(&power_save_blockers_); 1734 STLDeleteValues(&power_save_blockers_);
1730 } 1735 }
1731 1736
1732 } // namespace content 1737 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/pyautolib/pyauto.py ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698