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

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

Issue 2847443002: PlzNavigate: make NavigationResourceHandler a LayeredResourceHandler (Closed)
Patch Set: Addressed comments Created 3 years, 8 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
« no previous file with comments | « no previous file | content/browser/loader/navigation_resource_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0b5e04d31dfd583dc62b3b1bf7c455af9cb4f93c..55eb1ee156e9d58516b5d4eafbb640d93c2d3119 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -813,6 +813,11 @@ void NavigationRequest::OnWillProcessResponseChecksComplete(
NavigationThrottle::ThrottleCheckResult result) {
DCHECK(result != NavigationThrottle::DEFER);
+ // If the NavigationThrottles allowed the navigation to continue, have the
+ // processing of the response resume in the network stack.
+ if (result == NavigationThrottle::PROCEED)
+ loader_->ProceedWithResponse();
+
// Abort the request if needed. This includes requests that were blocked by
// NavigationThrottles and requests that should not commit (e.g. downloads,
// 204/205s). This will destroy the NavigationRequest.
@@ -833,9 +838,6 @@ void NavigationRequest::OnWillProcessResponseChecksComplete(
return;
}
- // Have the processing of the response resume in the network stack.
- loader_->ProceedWithResponse();
-
CommitNavigation();
// DO NOT ADD CODE after this. The previous call to CommitNavigation caused
« no previous file with comments | « no previous file | content/browser/loader/navigation_resource_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698