diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 18:09:02 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 18:09:02 +0000 |
commit | c7fa4367503441fefc7da332b0bddd329ceea9dd (patch) | |
tree | b1469aab9cb635f9f00096b7f746047272474690 /apps | |
parent | aca70615b08a5d741e5a10b91c8746e74d66f897 (diff) | |
download | chromium_src-c7fa4367503441fefc7da332b0bddd329ceea9dd.zip chromium_src-c7fa4367503441fefc7da332b0bddd329ceea9dd.tar.gz chromium_src-c7fa4367503441fefc7da332b0bddd329ceea9dd.tar.bz2 |
[components] Switch {RefCounted}ProfileKeyedService to use BrowserContext
instead of Profile. This will help move it out of chrome.
BUG=227219
Review URL: https://codereview.chromium.org/14141006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_restore_service_factory.cc | 5 | ||||
-rw-r--r-- | apps/app_restore_service_factory.h | 2 | ||||
-rw-r--r-- | apps/shortcut_manager_factory.cc | 5 | ||||
-rw-r--r-- | apps/shortcut_manager_factory.h | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/apps/app_restore_service_factory.cc b/apps/app_restore_service_factory.cc index 22ebe32..71dd80b 100644 --- a/apps/app_restore_service_factory.cc +++ b/apps/app_restore_service_factory.cc @@ -5,6 +5,7 @@ #include "apps/app_restore_service_factory.h" #include "apps/app_restore_service.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" namespace apps { @@ -35,8 +36,8 @@ AppRestoreServiceFactory::~AppRestoreServiceFactory() { } ProfileKeyedService* AppRestoreServiceFactory::BuildServiceInstanceFor( - Profile* profile) const { - return new AppRestoreService(profile); + content::BrowserContext* profile) const { + return new AppRestoreService(static_cast<Profile*>(profile)); } bool AppRestoreServiceFactory::ServiceIsCreatedWithProfile() const { diff --git a/apps/app_restore_service_factory.h b/apps/app_restore_service_factory.h index c17e845..b84c585 100644 --- a/apps/app_restore_service_factory.h +++ b/apps/app_restore_service_factory.h @@ -33,7 +33,7 @@ class AppRestoreServiceFactory : public ProfileKeyedServiceFactory { // ProfileKeyedServiceFactory: virtual ProfileKeyedService* BuildServiceInstanceFor( - Profile* profile) const OVERRIDE; + content::BrowserContext* profile) const OVERRIDE; virtual bool ServiceIsCreatedWithProfile() const OVERRIDE; }; diff --git a/apps/shortcut_manager_factory.cc b/apps/shortcut_manager_factory.cc index 201c58a..b76b16d 100644 --- a/apps/shortcut_manager_factory.cc +++ b/apps/shortcut_manager_factory.cc @@ -5,6 +5,7 @@ #include "apps/shortcut_manager_factory.h" #include "apps/shortcut_manager.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" namespace apps { @@ -35,8 +36,8 @@ ShortcutManagerFactory::~ShortcutManagerFactory() { } ProfileKeyedService* ShortcutManagerFactory::BuildServiceInstanceFor( - Profile* profile) const { - return new ShortcutManager(profile); + content::BrowserContext* profile) const { + return new ShortcutManager(static_cast<Profile*>(profile)); } bool ShortcutManagerFactory::ServiceIsCreatedWithProfile() const { diff --git a/apps/shortcut_manager_factory.h b/apps/shortcut_manager_factory.h index 946fba2..bed2136 100644 --- a/apps/shortcut_manager_factory.h +++ b/apps/shortcut_manager_factory.h @@ -33,7 +33,7 @@ class ShortcutManagerFactory : public ProfileKeyedServiceFactory { // ProfileKeyedServiceFactory: virtual ProfileKeyedService* BuildServiceInstanceFor( - Profile* profile) const OVERRIDE; + content::BrowserContext* profile) const OVERRIDE; virtual bool ServiceIsCreatedWithProfile() const OVERRIDE; }; |