diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
| commit | 7dbb3d5cf0c15f500944d211057644d6a2f37371 (patch) | |
| tree | 701119ba0596f51b0ab466d6472b0f98211359c5 /content/browser/download/download_resource_handler.cc | |
| parent | b2ecf4836a0eb284ddac7746b1f7ba613777a739 (diff) | |
| download | chromium_org-7dbb3d5cf0c15f500944d211057644d6a2f37371.tar.gz | |
Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
Diffstat (limited to 'content/browser/download/download_resource_handler.cc')
| -rw-r--r-- | content/browser/download/download_resource_handler.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc index c2a243870a..2a02cf926d 100644 --- a/content/browser/download/download_resource_handler.cc +++ b/content/browser/download/download_resource_handler.cc @@ -35,7 +35,7 @@ namespace content { namespace { void CallStartedCBOnUIThread( - const DownloadResourceHandler::OnStartedCallback& started_cb, + const DownloadUrlParameters::OnStartedCallback& started_cb, DownloadItem* item, net::Error error) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -50,7 +50,7 @@ void CallStartedCBOnUIThread( static void StartOnUIThread( scoped_ptr<DownloadCreateInfo> info, scoped_ptr<ByteStreamReader> stream, - const DownloadResourceHandler::OnStartedCallback& started_cb) { + const DownloadUrlParameters::OnStartedCallback& started_cb) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DownloadManager* download_manager = info->request_handle.GetDownloadManager(); @@ -62,12 +62,7 @@ static void StartOnUIThread( return; } - DownloadItem* item = download_manager->StartDownload( - info.Pass(), stream.Pass()); - - // |item| can be NULL if the download has been removed. - if (!started_cb.is_null()) - started_cb.Run(item, item ? net::OK : net::ERR_ABORTED); + download_manager->StartDownload(info.Pass(), stream.Pass(), started_cb); } } // namespace @@ -75,9 +70,9 @@ static void StartOnUIThread( const int DownloadResourceHandler::kDownloadByteStreamSize = 100 * 1024; DownloadResourceHandler::DownloadResourceHandler( - DownloadId id, + uint32 id, net::URLRequest* request, - const DownloadResourceHandler::OnStartedCallback& started_cb, + const DownloadUrlParameters::OnStartedCallback& started_cb, scoped_ptr<DownloadSaveInfo> save_info) : download_id_(id), render_view_id_(0), // Actually initialized below. |