summaryrefslogtreecommitdiffstats
path: root/content/browser/loader/stream_resource_handler.cc
diff options
context:
space:
mode:
authordavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 05:49:03 +0000
committerdavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 05:49:03 +0000
commit3780874a5b4d7470daf71357a7d5d001347f50b7 (patch)
treecdca9150eef2a25fb0bf173be11cc9c8a5958eed /content/browser/loader/stream_resource_handler.cc
parent4477aae3367d44c3000b312b7e4b531babf35b66 (diff)
downloadchromium_src-3780874a5b4d7470daf71357a7d5d001347f50b7.zip
chromium_src-3780874a5b4d7470daf71357a7d5d001347f50b7.tar.gz
chromium_src-3780874a5b4d7470daf71357a7d5d001347f50b7.tar.bz2
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
Diffstat (limited to 'content/browser/loader/stream_resource_handler.cc')
-rw-r--r--content/browser/loader/stream_resource_handler.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/loader/stream_resource_handler.cc b/content/browser/loader/stream_resource_handler.cc
index 8c8aae0..67309e8 100644
--- a/content/browser/loader/stream_resource_handler.cc
+++ b/content/browser/loader/stream_resource_handler.cc
@@ -93,12 +93,12 @@ bool StreamResourceHandler::OnReadCompleted(int request_id,
return true;
}
-bool StreamResourceHandler::OnResponseCompleted(
+void StreamResourceHandler::OnResponseCompleted(
int request_id,
const net::URLRequestStatus& status,
- const std::string& sec_info) {
+ const std::string& sec_info,
+ bool* defer) {
stream_->Finalize();
- return status.status() == net::URLRequestStatus::SUCCESS;
}
void StreamResourceHandler::OnDataDownloaded(