diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
| commit | 90dce4d38c5ff5333bea97d859d4e484e27edf0c (patch) | |
| tree | 9c51c7dd97d24b15befa97a3482c51851e5383a1 /chrome/browser/signin/about_signin_internals_factory.cc | |
| parent | 1515035f5917d10d363b0888a3615d581ad8b83f (diff) | |
| download | chromium_org-90dce4d38c5ff5333bea97d859d4e484e27edf0c.tar.gz | |
Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
Diffstat (limited to 'chrome/browser/signin/about_signin_internals_factory.cc')
| -rw-r--r-- | chrome/browser/signin/about_signin_internals_factory.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/signin/about_signin_internals_factory.cc b/chrome/browser/signin/about_signin_internals_factory.cc index 98f012836a..4ff1c098ce 100644 --- a/chrome/browser/signin/about_signin_internals_factory.cc +++ b/chrome/browser/signin/about_signin_internals_factory.cc @@ -5,19 +5,20 @@ #include "chrome/browser/signin/about_signin_internals_factory.h" #include "base/prefs/pref_service.h" -#include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/signin/about_signin_internals.h" #include "chrome/browser/signin/signin_internals_util.h" #include "chrome/browser/signin/token_service_factory.h" #include "chrome/common/pref_names.h" +#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "components/user_prefs/pref_registry_syncable.h" #include "google_apis/gaia/gaia_constants.h" using namespace signin_internals_util; AboutSigninInternalsFactory::AboutSigninInternalsFactory() - : ProfileKeyedServiceFactory("AboutSigninInternals", - ProfileDependencyManager::GetInstance()) { + : BrowserContextKeyedServiceFactory( + "AboutSigninInternals", + BrowserContextDependencyManager::GetInstance()) { DependsOn(SigninManagerFactory::GetInstance()); DependsOn(TokenServiceFactory::GetInstance()); } @@ -28,7 +29,7 @@ AboutSigninInternalsFactory::~AboutSigninInternalsFactory() {} AboutSigninInternals* AboutSigninInternalsFactory::GetForProfile( Profile* profile) { return static_cast<AboutSigninInternals*>( - GetInstance()->GetServiceForProfile(profile, true)); + GetInstance()->GetServiceForBrowserContext(profile, true)); } // static @@ -87,7 +88,8 @@ void AboutSigninInternalsFactory::RegisterUserPrefs( } } -ProfileKeyedService* AboutSigninInternalsFactory::BuildServiceInstanceFor( +BrowserContextKeyedService* +AboutSigninInternalsFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { AboutSigninInternals* service = new AboutSigninInternals(); service->Initialize(static_cast<Profile*>(profile)); |