From e582fdd525662debfd317452d87846b876a7bf70 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Tue, 20 Dec 2011 16:48:17 +0000 Subject: Move DownloadFile/DownloadItem/DownloadManager interfaces into content/public/browser, and also put them into the content namespace. BUG=98716 Review URL: http://codereview.chromium.org/9004005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115137 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/profiles/off_the_record_profile_impl.cc | 1 + chrome/browser/profiles/off_the_record_profile_impl.h | 2 +- chrome/browser/profiles/profile.cc | 2 +- chrome/browser/profiles/profile.h | 2 +- chrome/browser/profiles/profile_impl.cc | 1 + chrome/browser/profiles/profile_impl.h | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) (limited to 'chrome/browser/profiles') diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index b9b6508..d7788d8 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -66,6 +66,7 @@ #endif using content::BrowserThread; +using content::DownloadManager; namespace { diff --git a/chrome/browser/profiles/off_the_record_profile_impl.h b/chrome/browser/profiles/off_the_record_profile_impl.h index 38143ce..0292d8c0 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.h +++ b/chrome/browser/profiles/off_the_record_profile_impl.h @@ -65,7 +65,7 @@ class OffTheRecordProfileImpl : public Profile, virtual PrefService* GetPrefs() OVERRIDE; virtual PrefService* GetOffTheRecordPrefs() OVERRIDE; virtual TemplateURLFetcher* GetTemplateURLFetcher() OVERRIDE; - virtual DownloadManager* GetDownloadManager() OVERRIDE; + virtual content::DownloadManager* GetDownloadManager() OVERRIDE; virtual fileapi::FileSystemContext* GetFileSystemContext() OVERRIDE; virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE; virtual quota::QuotaManager* GetQuotaManager() OVERRIDE; diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc index 6543031..57b6ca5 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -45,7 +45,6 @@ #include "chrome/common/render_messages.h" #include "content/browser/appcache/chrome_appcache_service.h" #include "content/browser/chrome_blob_storage_context.h" -#include "content/browser/download/download_manager.h" #include "content/browser/file_system/browser_file_system_helper.h" #include "content/browser/host_zoom_map.h" #include "content/browser/in_process_webkit/webkit_context.h" @@ -53,6 +52,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/webui/web_ui.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/download_manager.h" #include "grit/locale_settings.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/database/database_tracker.h" diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h index d425d9d..5aed277 100644 --- a/chrome/browser/profiles/profile.h +++ b/chrome/browser/profiles/profile.h @@ -184,7 +184,7 @@ class Profile : public content::BrowserContext { virtual FilePath GetPath() = 0; virtual SSLHostState* GetSSLHostState() = 0; - virtual DownloadManager* GetDownloadManager() = 0; + virtual content::DownloadManager* GetDownloadManager() = 0; virtual net::URLRequestContextGetter* GetRequestContext() = 0; virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess( int renderer_child_id) = 0; diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index ab95047..43a47f9 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -144,6 +144,7 @@ using base::Time; using base::TimeDelta; using content::BrowserThread; +using content::DownloadManager; using content::UserMetricsAction; namespace { diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h index 98edb11..3e203fd 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -51,7 +51,7 @@ class ProfileImpl : public Profile, // content::BrowserContext implementation: virtual FilePath GetPath() OVERRIDE; virtual SSLHostState* GetSSLHostState() OVERRIDE; - virtual DownloadManager* GetDownloadManager() OVERRIDE; + virtual content::DownloadManager* GetDownloadManager() OVERRIDE; virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE; virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess( int renderer_child_id) OVERRIDE; -- cgit v1.1