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

Unified Diff: content/browser/loader/navigation_resource_throttle.cc

Issue 2632633006: Implement NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE. (Closed)
Patch Set: Fix navigation transition type. Created 3 years, 7 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 | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/common/frame_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/navigation_resource_throttle.cc
diff --git a/content/browser/loader/navigation_resource_throttle.cc b/content/browser/loader/navigation_resource_throttle.cc
index b8787626e829a86be9c43a5583d41c5bfe093eab..dcdceaea91c8e47c1c9e03dcf01e229181bba9f2 100644
--- a/content/browser/loader/navigation_resource_throttle.cc
+++ b/content/browser/loader/navigation_resource_throttle.cc
@@ -354,7 +354,8 @@ void NavigationResourceThrottle::OnUIChecksPerformed(
CancelAndIgnore();
} else if (result == NavigationThrottle::CANCEL) {
Cancel();
- } else if (result == NavigationThrottle::BLOCK_REQUEST) {
+ } else if (result == NavigationThrottle::BLOCK_REQUEST ||
+ result == NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE) {
CancelWithError(net::ERR_BLOCKED_BY_CLIENT);
} else if (result == NavigationThrottle::BLOCK_RESPONSE) {
// TODO(mkwst): If we cancel the main frame request with anything other than
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/common/frame_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698