diff options
9 files changed, 36 insertions, 1 deletions
diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc index 4498c98..d7e7a68 100644 --- a/content/browser/download/download_resource_handler.cc +++ b/content/browser/download/download_resource_handler.cc @@ -367,6 +367,12 @@ bool DownloadResourceHandler::OnResponseCompleted( return true; } +void DownloadResourceHandler::OnDataDownloaded( + int request_id, + int bytes_downloaded) { + NOTREACHED(); +} + // If the content-length header is not present (or contains something other // than numbers), the incoming content_length is -1 (unknown size). // Set the content length to 0 to indicate unknown size to DownloadManager. diff --git a/content/browser/download/download_resource_handler.h b/content/browser/download/download_resource_handler.h index fc3e029..f409964 100644 --- a/content/browser/download/download_resource_handler.h +++ b/content/browser/download/download_resource_handler.h @@ -76,6 +76,9 @@ class DownloadResourceHandler const net::URLRequestStatus& status, const std::string& security_info) OVERRIDE; + // N/A to this flavor of DownloadHandler. + virtual void OnDataDownloaded(int request_id, int bytes_downloaded) OVERRIDE; + void PauseRequest(); void ResumeRequest(); void CancelRequest(); diff --git a/content/browser/download/save_file_resource_handler.cc b/content/browser/download/save_file_resource_handler.cc index e2f2b89..d611040 100644 --- a/content/browser/download/save_file_resource_handler.cc +++ b/content/browser/download/save_file_resource_handler.cc @@ -109,6 +109,12 @@ bool SaveFileResourceHandler::OnResponseCompleted( return true; } +void SaveFileResourceHandler::OnDataDownloaded( + int request_id, + int bytes_downloaded) { + NOTREACHED(); +} + void SaveFileResourceHandler::set_content_length( const std::string& content_length) { base::StringToInt64(content_length, &content_length_); diff --git a/content/browser/download/save_file_resource_handler.h b/content/browser/download/save_file_resource_handler.h index 07e24ba..8f77f5b 100644 --- a/content/browser/download/save_file_resource_handler.h +++ b/content/browser/download/save_file_resource_handler.h @@ -59,6 +59,9 @@ class SaveFileResourceHandler : public ResourceHandler { const net::URLRequestStatus& status, const std::string& security_info) OVERRIDE; + // N/A to this flavor of SaveFileResourceHandler. + virtual void OnDataDownloaded(int request_id, int bytes_downloaded) OVERRIDE; + // If the content-length header is not present (or contains something other // than numbers), StringToInt64 returns 0, which indicates 'unknown size' and // is handled correctly by the SaveManager. diff --git a/content/browser/loader/certificate_resource_handler.cc b/content/browser/loader/certificate_resource_handler.cc index 70a38e2..266b630 100644 --- a/content/browser/loader/certificate_resource_handler.cc +++ b/content/browser/loader/certificate_resource_handler.cc @@ -142,4 +142,10 @@ void CertificateResourceHandler::AssembleResource() { DCHECK_EQ(content_length_, bytes_copied); } +void CertificateResourceHandler::OnDataDownloaded( + int request_id, + int bytes_downloaded) { + NOTREACHED(); +} + } // namespace content diff --git a/content/browser/loader/certificate_resource_handler.h b/content/browser/loader/certificate_resource_handler.h index ba07bf5..428063a 100644 --- a/content/browser/loader/certificate_resource_handler.h +++ b/content/browser/loader/certificate_resource_handler.h @@ -72,6 +72,9 @@ class CertificateResourceHandler : public ResourceHandler { const net::URLRequestStatus& urs, const std::string& sec_info) OVERRIDE; + // N/A to cert downloading. + virtual void OnDataDownloaded(int request_id, int bytes_downloaded) OVERRIDE; + private: typedef std::vector<std::pair<scoped_refptr<net::IOBuffer>, size_t> > ContentVector; diff --git a/content/browser/loader/resource_handler.h b/content/browser/loader/resource_handler.h index dceeefb..aa5de15 100644 --- a/content/browser/loader/resource_handler.h +++ b/content/browser/loader/resource_handler.h @@ -101,7 +101,7 @@ class CONTENT_EXPORT ResourceHandler // to indicate progress of 'download_to_file' requests. OnReadCompleted // calls are consumed by the RedirectToFileResourceHandler and replaced // with OnDataDownloaded calls. - virtual void OnDataDownloaded(int request_id, int bytes_downloaded) {} + virtual void OnDataDownloaded(int request_id, int bytes_downloaded) = 0; protected: ResourceHandler() : controller_(NULL) {} diff --git a/content/browser/loader/sync_resource_handler.cc b/content/browser/loader/sync_resource_handler.cc index 390deed..3b9ee1d 100644 --- a/content/browser/loader/sync_resource_handler.cc +++ b/content/browser/loader/sync_resource_handler.cc @@ -127,4 +127,11 @@ bool SyncResourceHandler::OnResponseCompleted( return true; } +void SyncResourceHandler::OnDataDownloaded( + int request_id, + int bytes_downloaded) { + // Sync requests don't involve ResourceMsg_DataDownloaded messages + // being sent back to renderers as progress is made. +} + } // namespace content diff --git a/content/browser/loader/sync_resource_handler.h b/content/browser/loader/sync_resource_handler.h index f434892..af25472 100644 --- a/content/browser/loader/sync_resource_handler.h +++ b/content/browser/loader/sync_resource_handler.h @@ -56,6 +56,7 @@ class SyncResourceHandler : public ResourceHandler { virtual bool OnResponseCompleted(int request_id, const net::URLRequestStatus& status, const std::string& security_info) OVERRIDE; + virtual void OnDataDownloaded(int request_id, int bytes_downloaded) OVERRIDE; private: enum { kReadBufSize = 3840 }; |