Index: content/browser/download/download_manager_impl.cc |
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc |
index 7562c0f3619b30e5e4e6ea0aa4dfc9c50570710f..7ed0f1d181d5e9d85f76dfb25790ca0c31137a27 100644 |
--- a/content/browser/download/download_manager_impl.cc |
+++ b/content/browser/download/download_manager_impl.cc |
@@ -24,6 +24,7 @@ |
#include "content/browser/download/download_item_factory.h" |
#include "content/browser/download/download_item_impl.h" |
#include "content/browser/download/download_stats.h" |
+#include "content/browser/download/url_downloader.h" |
#include "content/browser/loader/resource_dispatcher_host_impl.h" |
#include "content/browser/renderer_host/render_view_host_impl.h" |
#include "content/browser/web_contents/web_contents_impl.h" |
@@ -50,7 +51,9 @@ namespace content { |
namespace { |
void BeginDownload(scoped_ptr<DownloadUrlParameters> params, |
- uint32 download_id) { |
+ uint32 download_id, |
+ bool has_web_contents, |
+ DownloadManager* download_manager) { |
asanka
2015/11/20 19:57:46
Since this is in the download guts, you can use Do
svaldez
2015/11/23 15:18:56
Done.
|
DCHECK_CURRENTLY_ON(BrowserThread::IO); |
// ResourceDispatcherHost{Base} is-not-a URLRequest::Delegate, and |
// DownloadUrlParameters can-not include resource_dispatcher_host_impl.h, so |
@@ -121,19 +124,21 @@ void BeginDownload(scoped_ptr<DownloadUrlParameters> params, |
save_info->prompt_for_save_location = params->prompt(); |
save_info->file = params->GetFile(); |
- ResourceDispatcherHost::Get()->BeginDownload( |
- request.Pass(), |
- params->referrer(), |
- params->content_initiated(), |
- params->resource_context(), |
- params->render_process_host_id(), |
- params->render_view_host_routing_id(), |
- params->render_frame_host_routing_id(), |
- params->prefer_cache(), |
- params->do_not_prompt_for_login(), |
- save_info.Pass(), |
- download_id, |
- params->callback()); |
+ if (has_web_contents) { |
asanka
2015/11/20 19:57:46
Rather than passing around this boolean, you can c
svaldez
2015/11/23 15:18:56
Done.
|
+ ResourceDispatcherHost::Get()->BeginDownload( |
+ request.Pass(), params->referrer(), params->content_initiated(), |
+ params->resource_context(), params->render_process_host_id(), |
+ params->render_view_host_routing_id(), |
+ params->render_frame_host_routing_id(), params->prefer_cache(), |
+ params->do_not_prompt_for_login(), save_info.Pass(), download_id, |
+ params->callback()); |
+ } else { |
+ UrlDownloader::BeginDownload( |
+ download_manager, request.Pass(), params->referrer(), |
+ params->content_initiated(), params->resource_context(), |
asanka
2015/11/20 19:57:46
For this case, content_initiated should always be
svaldez
2015/11/23 15:18:56
Done.
|
+ params->prefer_cache(), params->do_not_prompt_for_login(), |
+ save_info.Pass(), download_id, params->callback()); |
+ } |
} |
class MapValueIteratorAdapter { |
@@ -537,10 +542,10 @@ void DownloadManagerImpl::ResumeInterruptedDownload( |
scoped_ptr<content::DownloadUrlParameters> params, |
uint32 id) { |
RecordDownloadSource(INITIATED_BY_RESUMPTION); |
- BrowserThread::PostTask( |
- BrowserThread::IO, |
- FROM_HERE, |
- base::Bind(&BeginDownload, base::Passed(¶ms), id)); |
+ bool has_web_contents = params->render_process_host_id() != -1; |
+ BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
+ base::Bind(&BeginDownload, base::Passed(¶ms), id, |
+ has_web_contents, base::Unretained(this))); |
} |
void DownloadManagerImpl::SetDownloadItemFactoryForTesting( |
@@ -637,9 +642,10 @@ void DownloadManagerImpl::DownloadUrl( |
DCHECK(params->prefer_cache()); |
DCHECK_EQ("POST", params->method()); |
} |
- BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind( |
- &BeginDownload, base::Passed(¶ms), |
- content::DownloadItem::kInvalidId)); |
+ BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
+ base::Bind(&BeginDownload, base::Passed(¶ms), |
+ content::DownloadItem::kInvalidId, true, |
+ base::Unretained(this))); |
} |
void DownloadManagerImpl::AddObserver(Observer* observer) { |