From d22e800e2cf8ddc13d4491e9eeec09a93815e7a9 Mon Sep 17 00:00:00 2001 From: "davidben@chromium.org" Date: Wed, 28 May 2014 21:55:57 +0000 Subject: Remove request_id parameter from ResourceHandler methods. AsyncResourceHandler and downloads are the only components which consume it. Everyone else just passes it down. Pull it out of ResourceRequestInfo where needed. Other components need not deal with it. BUG=376003 Review URL: https://codereview.chromium.org/298253006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273368 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/loader/sync_resource_handler.h | 30 ++++++++------------------ 1 file changed, 9 insertions(+), 21 deletions(-) (limited to 'content/browser/loader/sync_resource_handler.h') diff --git a/content/browser/loader/sync_resource_handler.h b/content/browser/loader/sync_resource_handler.h index 3a71483..693b48f 100644 --- a/content/browser/loader/sync_resource_handler.h +++ b/content/browser/loader/sync_resource_handler.h @@ -33,34 +33,22 @@ class SyncResourceHandler : public ResourceHandler { ResourceDispatcherHostImpl* resource_dispatcher_host); virtual ~SyncResourceHandler(); - virtual bool OnUploadProgress(int request_id, - uint64 position, - uint64 size) OVERRIDE; - virtual bool OnRequestRedirected(int request_id, - const GURL& new_url, + virtual bool OnUploadProgress(uint64 position, uint64 size) OVERRIDE; + virtual bool OnRequestRedirected(const GURL& new_url, ResourceResponse* response, bool* defer) OVERRIDE; - virtual bool OnResponseStarted(int request_id, - ResourceResponse* response, + virtual bool OnResponseStarted(ResourceResponse* response, bool* defer) OVERRIDE; - virtual bool OnWillStart(int request_id, - const GURL& url, - bool* defer) OVERRIDE; - virtual bool OnBeforeNetworkStart(int request_id, - const GURL& url, - bool* defer) OVERRIDE; - virtual bool OnWillRead(int request_id, - scoped_refptr* buf, + virtual bool OnWillStart(const GURL& url, bool* defer) OVERRIDE; + virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) OVERRIDE; + virtual bool OnWillRead(scoped_refptr* buf, int* buf_size, int min_size) OVERRIDE; - virtual bool OnReadCompleted(int request_id, - int bytes_read, - bool* defer) OVERRIDE; - virtual void OnResponseCompleted(int request_id, - const net::URLRequestStatus& status, + virtual bool OnReadCompleted(int bytes_read, bool* defer) OVERRIDE; + virtual void OnResponseCompleted(const net::URLRequestStatus& status, const std::string& security_info, bool* defer) OVERRIDE; - virtual void OnDataDownloaded(int request_id, int bytes_downloaded) OVERRIDE; + virtual void OnDataDownloaded(int bytes_downloaded) OVERRIDE; private: enum { kReadBufSize = 3840 }; -- cgit v1.1