Index: chrome/browser/download/download_item.cc |
diff --git a/chrome/browser/download/download_item.cc b/chrome/browser/download/download_item.cc |
index db8e0b804d600a52af40ef9badde2d9b2bd30931..dad1c4445c68b21e03899b7bfa3b3d86aa569ceb 100644 |
--- a/chrome/browser/download/download_item.cc |
+++ b/chrome/browser/download/download_item.cc |
@@ -19,6 +19,7 @@ |
#include "chrome/browser/download/download_extensions.h" |
#include "chrome/browser/download/download_file_manager.h" |
#include "chrome/browser/download/download_history.h" |
+#include "chrome/browser/download/download_id.h" |
#include "chrome/browser/download/download_manager.h" |
#include "chrome/browser/download/download_prefs.h" |
#include "chrome/browser/download/download_state_info.h" |
@@ -226,6 +227,10 @@ DownloadItem::~DownloadItem() { |
download_manager_->AssertQueueStateConsistent(this); |
} |
+DownloadId DownloadItem::global_id() const { |
+ return DownloadId(download_manager_, id()); |
+} |
+ |
void DownloadItem::AddObserver(Observer* observer) { |
// TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved. |
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
@@ -645,7 +650,7 @@ void DownloadItem::OnDownloadCompleting(DownloadFileManager* file_manager) { |
if (NeedsRename()) { |
BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
NewRunnableMethod(file_manager, |
- &DownloadFileManager::RenameCompletingDownloadFile, id(), |
+ &DownloadFileManager::RenameCompletingDownloadFile, global_id(), |
GetTargetFilePath(), safety_state() == SAFE)); |
return; |
} |
@@ -653,9 +658,8 @@ void DownloadItem::OnDownloadCompleting(DownloadFileManager* file_manager) { |
DCHECK(!is_extension_install()); |
Completed(); |
- BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
- NewRunnableMethod(file_manager, &DownloadFileManager::CompleteDownload, |
- id())); |
+ BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod( |
+ file_manager, &DownloadFileManager::CompleteDownload, global_id())); |
} |
void DownloadItem::OnDownloadRenamedToFinalName(const FilePath& full_path) { |