diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 05:49:03 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 05:49:03 +0000 |
| commit | 3780874a5b4d7470daf71357a7d5d001347f50b7 (patch) | |
| tree | cdca9150eef2a25fb0bf173be11cc9c8a5958eed /content/browser/loader/cross_site_resource_handler.h | |
| parent | 4477aae3367d44c3000b312b7e4b531babf35b66 (diff) | |
| download | chromium_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/cross_site_resource_handler.h')
| -rw-r--r-- | content/browser/loader/cross_site_resource_handler.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/loader/cross_site_resource_handler.h b/content/browser/loader/cross_site_resource_handler.h index 3534107..b0846b6 100644 --- a/content/browser/loader/cross_site_resource_handler.h +++ b/content/browser/loader/cross_site_resource_handler.h @@ -36,9 +36,10 @@ class CrossSiteResourceHandler : public LayeredResourceHandler { 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; // We can now send the response to the new renderer, which will cause // WebContentsImpl to swap in the new renderer and destroy the old one. |