diff options
Diffstat (limited to 'chrome/browser/download/chrome_download_manager_delegate.cc')
-rw-r--r-- | chrome/browser/download/chrome_download_manager_delegate.cc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index 80c6dbc..08f7265 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -4,6 +4,8 @@ #include "chrome/browser/download/chrome_download_manager_delegate.h" +#include "base/bind.h" +#include "base/bind_helpers.h" #include "base/callback.h" #include "base/file_util.h" #include "base/path_service.h" @@ -59,9 +61,11 @@ void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) { download_manager_ = dm; download_history_.reset(new DownloadHistory(profile_)); download_history_->Load( - NewCallback(dm, &DownloadManager::OnPersistentStoreQueryComplete)); + base::Bind(&DownloadManager::OnPersistentStoreQueryComplete, + base::Unretained(dm))); download_history_->GetNextId( - NewCallback(dm, &DownloadManager::OnPersistentStoreGetNextId)); + base::Bind(&DownloadManager::OnPersistentStoreGetNextId, + base::Unretained(dm))); } void ChromeDownloadManagerDelegate::Shutdown() { @@ -206,8 +210,8 @@ void ChromeDownloadManagerDelegate::OnResponseCompleted( void ChromeDownloadManagerDelegate::AddItemToPersistentStore( DownloadItem* item) { download_history_->AddEntry(item, - NewCallback(this, - &ChromeDownloadManagerDelegate::OnItemAddedToPersistentStore)); + base::Bind(&ChromeDownloadManagerDelegate::OnItemAddedToPersistentStore, + base::Unretained(this))); } void ChromeDownloadManagerDelegate::UpdateItemInPersistentStore( @@ -293,8 +297,10 @@ void ChromeDownloadManagerDelegate::CheckDownloadUrlDone( if (is_dangerous_url) download->MarkUrlDangerous(); - download_history_->CheckVisitedReferrerBefore(download_id, - download->referrer_url(), NewCallback(this, + download_history_->CheckVisitedReferrerBefore( + download_id, download->referrer_url(), + NewCallback( + this, &ChromeDownloadManagerDelegate::CheckVisitedReferrerBeforeDone)); } @@ -380,12 +386,9 @@ void ChromeDownloadManagerDelegate::CheckVisitedReferrerBeforeDone( // now and pass the value to the FILE thread. BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, - NewRunnableMethod( - this, - &ChromeDownloadManagerDelegate::CheckIfSuggestedPathExists, - download->id(), - state, - download_prefs_->download_path())); + base::Bind(&ChromeDownloadManagerDelegate::CheckIfSuggestedPathExists, + this, download->id(), state, + download_prefs_->download_path())); } void ChromeDownloadManagerDelegate::CheckIfSuggestedPathExists( @@ -472,11 +475,8 @@ void ChromeDownloadManagerDelegate::CheckIfSuggestedPathExists( BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableMethod( - this, - &ChromeDownloadManagerDelegate::OnPathExistenceAvailable, - download_id, - state)); + base::Bind(&ChromeDownloadManagerDelegate::OnPathExistenceAvailable, + this, download_id, state)); } void ChromeDownloadManagerDelegate::OnPathExistenceAvailable( |