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

Unified Diff: chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc

Issue 10640019: Remove the HANDLED_EXTERNALLY status code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: hack, hack, hack Created 8 years, 6 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: chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc
diff --git a/chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc b/chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc
index 674aa5502be29a0c2d76d87ee6050b516a01a263..eaecef29a672c52c6eddc5309c208942482789a7 100644
--- a/chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc
+++ b/chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc
@@ -10,9 +10,8 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/resource_request_info.h"
#include "content/public/browser/resource_controller.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_delegate.h"
#include "content/public/common/referrer.h"
+#include "net/base/net_errors.h"
#include "net/url_request/url_request.h"
using content::BrowserThread;
@@ -20,8 +19,6 @@ using content::ChildProcessSecurityPolicy;
using content::Referrer;
using content::RenderViewHost;
using content::ResourceRequestInfo;
-using content::WebContents;
-using content::WebContentsDelegate;
namespace {
@@ -118,9 +115,7 @@ void InterceptNavigationResourceThrottle::OnResultObtained(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (should_ignore_navigation) {
- // TODO(mkosiba): Cancel() results in a CANCELLED status but what we really
- // want is a HANDLED_EXTERNALLY status.
- controller()->Cancel();
+ controller()->CancelWithHandledExternally();
} else {
controller()->Resume();
}

Powered by Google App Engine
This is Rietveld 408576698