Chromium Code Reviews| 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 e928724af95f21d29d388deb26cd3fa196ac4d71..f8ac574d6c02cbd2abbd54e3843d16c1f727d9cc 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(); |
| @@ -78,7 +78,7 @@ ResourceLoader::~ResourceLoader() { |
| void ResourceLoader::StartRequest() { |
| if (delegate_->HandleExternalProtocol(this, request_->url())) { |
| - CancelRequestInternal(net::ERR_UNKNOWN_URL_SCHEME, false); |
| + CancelAndIgnore(); |
| return; |
| } |
| @@ -101,6 +101,12 @@ void ResourceLoader::CancelRequest(bool from_renderer) { |
| CancelRequestInternal(net::ERR_ABORTED, from_renderer); |
| } |
| +void ResourceLoader::CancelAndIgnore() { |
| + ResourceRequestInfoImpl* info = GetRequestInfo(); |
| + info->set_ignored(true); |
|
darin (slow to review)
2012/08/29 22:01:37
nit: Maybe this flag would be more clear if it wer
mkosiba (inactive)
2012/08/30 15:29:43
Great naming suggestion! Thanks!
|
| + CancelRequest(false); |
| +} |
| + |
| void ResourceLoader::ReportUploadProgress() { |
| ResourceRequestInfoImpl* info = GetRequestInfo(); |
| @@ -204,7 +210,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); |
| + CancelAndIgnore(); |
| return; |
| } |