Chromium Code Reviews| Index: chrome/browser/download/download_file.cc |
| diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc |
| index 629ee117a95e44d2008f1fc727b722d965f4cffb..50af091568ffefc6587396f23992e7a1f8d668a8 100644 |
| --- a/chrome/browser/download/download_file.cc |
| +++ b/chrome/browser/download/download_file.cc |
| @@ -21,8 +21,7 @@ DownloadFile::DownloadFile(const DownloadCreateInfo* info, |
| info->received_bytes, |
| info->save_info.file_stream), |
| id_(info->download_id), |
| - child_id_(info->child_id), |
| - request_id_(info->request_id), |
| + process_handle_(info->process_handle), |
| download_manager_(download_manager) { |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
| @@ -33,13 +32,7 @@ DownloadFile::~DownloadFile() { |
| } |
| void DownloadFile::CancelDownloadRequest(ResourceDispatcherHost* rdh) { |
|
Paweł Hajdan Jr.
2011/05/06 18:04:42
nit: Please restore the BrowserThread DCHECK.
ahendrickson
2011/05/09 15:57:31
It doesn't matter what thread this is called from,
Paweł Hajdan Jr.
2011/05/09 19:47:30
Agreed, but it's very important to ensure that Dow
ahendrickson
2011/05/10 18:04:43
Done.
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
| - BrowserThread::PostTask( |
| - BrowserThread::IO, FROM_HERE, |
| - NewRunnableFunction(&download_util::CancelDownloadRequest, |
| - rdh, |
| - child_id_, |
| - request_id_)); |
| + download_util::CancelDownloadRequest(rdh, process_handle_); |
|
Randy Smith (Not in Mondays)
2011/05/09 00:57:45
I don't want to put more stuff into download_util.
Paweł Hajdan Jr.
2011/05/09 19:47:30
Wait, what's wrong with this change? We're not add
Randy Smith (Not in Mondays)
2011/05/09 21:42:20
Ah, whoops, I see. Quite right. I rescind my obj
|
| } |
| DownloadManager* DownloadFile::GetDownloadManager() { |
| @@ -49,15 +42,15 @@ DownloadManager* DownloadFile::GetDownloadManager() { |
| std::string DownloadFile::DebugString() const { |
| return base::StringPrintf("{" |
| - " full_path_ = " "\"%s\"" |
| " id_ = " "%d" |
| - " child_id_ = " "%d" |
| - " request_id_ = " "%d" |
| + " child_id = " "%d" |
| + " request_id = " "%d" |
| + " render_view_id = " "%d" |
| " Base File = %s" |
| " }", |
| - full_path_.value().c_str(), |
| id_, |
| - child_id_, |
| - request_id_, |
| + process_handle_.child_id(), |
| + process_handle_.request_id(), |
| + process_handle_.render_view_id(), |
| BaseFile::DebugString().c_str()); |
| } |