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 be923ca81f9f7dae88c38ee5ac58a5a459ee38e7..af9685fc45c31094ee465816f349b7cc8a668656 100644 |
| --- a/content/browser/renderer_host/resource_loader.cc |
| +++ b/content/browser/renderer_host/resource_loader.cc |
| @@ -82,7 +82,8 @@ ResourceLoader::~ResourceLoader() { |
| void ResourceLoader::StartRequest() { |
| if (delegate_->HandleExternalProtocol(this, request_->url())) { |
| - CancelRequestInternal(net::ERR_UNKNOWN_URL_SCHEME, false); |
| + GetRequestInfo()->set_handled_externally(true); |
| + CancelRequestInternal(net::ERR_ABORTED, false); |
| return; |
| } |
| @@ -105,6 +106,11 @@ void ResourceLoader::CancelRequest(bool from_renderer) { |
| CancelRequestInternal(net::ERR_ABORTED, from_renderer); |
| } |
| +void ResourceLoader::CancelWithHandledExternally() { |
| + GetRequestInfo()->set_handled_externally(true); |
| + CancelRequestInternal(net::ERR_ABORTED, false); |
|
darin (slow to review)
2012/06/25 16:15:32
another idea, which may be too crazy, is to just g
|
| +} |
| + |
| void ResourceLoader::ReportUploadProgress() { |
| ResourceRequestInfoImpl* info = GetRequestInfo(); |
| @@ -203,7 +209,8 @@ 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); |
| + GetRequestInfo()->set_handled_externally(true); |
| + CancelRequestInternal(net::ERR_ABORTED, false); |
| return; |
| } |