summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/resource_dispatcher_host.h
diff options
context:
space:
mode:
authortonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 23:47:25 +0000
committertonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 23:47:25 +0000
commit446b42d218dfb6ba77b88c3d6ebde73a51fbf423 (patch)
tree8e519f260a52ea38a0bd6efd188b34be56d27a00 /chrome/browser/renderer_host/resource_dispatcher_host.h
parent28a0426533b147ba33c08c931e273db297a228c8 (diff)
downloadchromium_src-446b42d218dfb6ba77b88c3d6ebde73a51fbf423.zip
chromium_src-446b42d218dfb6ba77b88c3d6ebde73a51fbf423.tar.gz
chromium_src-446b42d218dfb6ba77b88c3d6ebde73a51fbf423.tar.bz2
Fix a bug which caused a hang when loading a resource with
a content-type that triggers a download and a response code other than 2xx. This modifies the fix introduced in r7703 for crbug.com/5800. I've verified that crbug.com/5800 is not reintroduced. This patch leaves the confusing ERR_FILE_NOT_FOUND message in place. I plan to improve that message in a subsequent patch. BUG=31266 TEST=ResourceDispatcherHostTest.ForbiddenDownload Review URL: http://codereview.chromium.org/1545026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/resource_dispatcher_host.h')
-rw-r--r--chrome/browser/renderer_host/resource_dispatcher_host.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.h b/chrome/browser/renderer_host/resource_dispatcher_host.h
index b9b7930..c09fae6 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.h
@@ -318,14 +318,6 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
// true on success.
bool CompleteResponseStarted(URLRequest* request);
- // Cancels the given request if it still exists. We ignore cancels from the
- // renderer in the event of a download. If |allow_delete| is true and no IO
- // is pending, the request is removed and deleted.
- void CancelRequest(int process_unique_id,
- int request_id,
- bool from_renderer,
- bool allow_delete);
-
// Helper function for regular and download requests.
void BeginRequestInternal(URLRequest* request);