Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: chrome/browser/android/download/download_manager_service.cc

Issue 2014803002: Move DownloadControllerAndroid from content/ to chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/download/download_manager_service.cc
diff --git a/chrome/browser/android/download/download_manager_service.cc b/chrome/browser/android/download/download_manager_service.cc
index a7cc6ea4043199f5636d8c93c449d8a9ce29a25e..681d5f31b226022443ab65a2602c97472458d8d0 100644
--- a/chrome/browser/android/download/download_manager_service.cc
+++ b/chrome/browser/android/download/download_manager_service.cc
@@ -9,11 +9,11 @@
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
+#include "chrome/browser/android/download/download_controller_base.h"
#include "chrome/browser/download/download_service.h"
#include "chrome/browser/download/download_service_factory.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/grit/generated_resources.h"
-#include "content/public/browser/android/download_controller_android.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/download_item.h"
#include "jni/DownloadManagerService_jni.h"
@@ -45,7 +45,7 @@ DownloadManagerService::DownloadManagerService(
jobject obj)
: java_ref_(env, obj),
is_history_query_complete_(false) {
- content::DownloadControllerAndroid::Get()->SetDefaultDownloadFileName(
+ DownloadControllerBase::Get()->SetDefaultDownloadFileName(
l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME));
}
@@ -132,7 +132,7 @@ void DownloadManagerService::ResumeDownloadInternal(
OnResumptionFailed(download_guid);
return;
}
- item->AddObserver(content::DownloadControllerAndroid::Get());
+ item->AddObserver(DownloadControllerBase::Get());
item->Resume();
if (!resume_callback_for_testing_.is_null())
resume_callback_for_testing_.Run(true);
@@ -146,7 +146,7 @@ void DownloadManagerService::CancelDownloadInternal(
content::DownloadItem* item = manager->GetDownloadByGuid(download_guid);
if (item) {
item->Cancel(true);
- item->RemoveObserver(content::DownloadControllerAndroid::Get());
+ item->RemoveObserver(DownloadControllerBase::Get());
}
}
@@ -158,7 +158,7 @@ void DownloadManagerService::PauseDownloadInternal(
content::DownloadItem* item = manager->GetDownloadByGuid(download_guid);
if (item) {
item->Pause();
- item->RemoveObserver(content::DownloadControllerAndroid::Get());
+ item->RemoveObserver(DownloadControllerBase::Get());
}
}

Powered by Google App Engine
This is Rietveld 408576698