From 3780874a5b4d7470daf71357a7d5d001347f50b7 Mon Sep 17 00:00:00 2001 From: "davidben@chromium.org" Date: Mon, 18 Nov 2013 05:49:03 +0000 Subject: Make ResourceHandler::OnResponseCompleted take a defer output parameter. Every other method of ResourceHandler returns false to abort and sets *defer to cancel. Between the StreamResourceHandler fix here and https://src.chromium.org/viewvc/chrome?view=rev&revision=233661, there were twice as many ResourceHandlers that mistakenly deferred shutdown as intentionally. (RedirectToFileResourceHandler and CrossSiteResourceHandler do so intentionally.) Make this consistent so it's not as confusing. BUG=none Review URL: https://codereview.chromium.org/74373002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235631 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/loader/async_resource_handler.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'content/browser/loader/async_resource_handler.h') diff --git a/content/browser/loader/async_resource_handler.h b/content/browser/loader/async_resource_handler.h index 4d980d2..ac15b59 100644 --- a/content/browser/loader/async_resource_handler.h +++ b/content/browser/loader/async_resource_handler.h @@ -56,9 +56,10 @@ class AsyncResourceHandler : public ResourceHandler, virtual bool OnReadCompleted(int request_id, int bytes_read, bool* defer) OVERRIDE; - virtual bool OnResponseCompleted(int request_id, + virtual void OnResponseCompleted(int request_id, const net::URLRequestStatus& status, - const std::string& security_info) OVERRIDE; + const std::string& security_info, + bool* defer) OVERRIDE; virtual void OnDataDownloaded(int request_id, int bytes_downloaded) OVERRIDE; -- cgit v1.1