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

Unified Diff: content/browser/frame_host/navigation_request.cc

Issue 2642303002: PlzNavigate: Chrome UI changes for new methods of WebContentsObserver (Closed)
Patch Set: jam@ comments Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_request.cc
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index a047b10686475e946f87bc5cd09d262fbb5026a3..2a81cab4c6b10532adfdf6392156d21d68a79769 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -575,7 +575,7 @@ void NavigationRequest::OnStartChecksComplete(
if (result == NavigationThrottle::CANCEL_AND_IGNORE ||
result == NavigationThrottle::CANCEL) {
// TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE.
- frame_tree_node_->ResetNavigationRequest(false);
+ OnRequestFailed(false, net::ERR_ABORTED);
return;
}
@@ -668,7 +668,7 @@ void NavigationRequest::OnRedirectChecksComplete(
if (result == NavigationThrottle::CANCEL_AND_IGNORE ||
result == NavigationThrottle::CANCEL) {
// TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE.
- frame_tree_node_->ResetNavigationRequest(false);
+ OnRequestFailed(false, net::ERR_ABORTED);
return;
}
@@ -687,7 +687,7 @@ void NavigationRequest::OnWillProcessResponseChecksComplete(
// TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE.
frame_tree_node_->navigator()->DiscardPendingEntryIfNeeded(
navigation_handle_.get());
- frame_tree_node_->ResetNavigationRequest(false);
+ OnRequestFailed(false, net::ERR_ABORTED);
return;
}

Powered by Google App Engine
This is Rietveld 408576698