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

Unified Diff: content/browser/renderer_host/resource_loader.cc

Issue 10640019: Remove the HANDLED_EXTERNALLY status code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed some minor issues 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: content/browser/renderer_host/resource_loader.cc
diff --git a/content/browser/renderer_host/resource_loader.cc b/content/browser/renderer_host/resource_loader.cc
index be923ca81f9f7dae88c38ee5ac58a5a459ee38e7..ada06e44c3c352f79c3be630a2f4d8e6685c0ccb 100644
--- a/content/browser/renderer_host/resource_loader.cc
+++ b/content/browser/renderer_host/resource_loader.cc
@@ -28,7 +28,7 @@ namespace {
void PopulateResourceResponse(net::URLRequest* request,
ResourceResponse* response) {
- response->head.status = request->status();
+ response->head.error_code = request->status().error();
response->head.request_time = request->request_time();
response->head.response_time = request->response_time();
response->head.headers = request->response_headers();
@@ -82,7 +82,7 @@ ResourceLoader::~ResourceLoader() {
void ResourceLoader::StartRequest() {
if (delegate_->HandleExternalProtocol(this, request_->url())) {
- CancelRequestInternal(net::ERR_UNKNOWN_URL_SCHEME, false);
+ CancelRequestInternal(net::OK_HANDLED_EXTERNALLY, false);
return;
}
@@ -105,6 +105,10 @@ void ResourceLoader::CancelRequest(bool from_renderer) {
CancelRequestInternal(net::ERR_ABORTED, from_renderer);
}
+void ResourceLoader::CancelWithError(int error) {
+ CancelRequestInternal(error, false);
+}
+
void ResourceLoader::ReportUploadProgress() {
ResourceRequestInfoImpl* info = GetRequestInfo();
@@ -203,7 +207,7 @@ void ResourceLoader::OnReceivedRedirect(net::URLRequest* unused,
if (delegate_->HandleExternalProtocol(this, new_url)) {
// The request is complete so we can remove it.
- CancelRequestInternal(net::ERR_UNKNOWN_URL_SCHEME, false);
+ CancelRequestInternal(net::OK_HANDLED_EXTERNALLY, false);
return;
}

Powered by Google App Engine
This is Rietveld 408576698