OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/signin/signin_manager_factory.h" | 5 #include "chrome/browser/signin/signin_manager_factory.h" |
6 | 6 |
7 #include "base/prefs/pref_registry_simple.h" | 7 #include "base/prefs/pref_registry_simple.h" |
8 #include "chrome/browser/profiles/profile_dependency_manager.h" | 8 #include "chrome/browser/profiles/profile_dependency_manager.h" |
| 9 #include "chrome/browser/signin/chrome_signin_manager_delegate.h" |
9 #include "chrome/browser/signin/signin_manager.h" | 10 #include "chrome/browser/signin/signin_manager.h" |
10 #include "chrome/browser/signin/token_service_factory.h" | 11 #include "chrome/browser/signin/token_service_factory.h" |
11 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 12 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
12 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
13 #include "components/user_prefs/pref_registry_syncable.h" | 14 #include "components/user_prefs/pref_registry_syncable.h" |
14 | 15 |
15 SigninManagerFactory::SigninManagerFactory() | 16 SigninManagerFactory::SigninManagerFactory() |
16 : ProfileKeyedServiceFactory("SigninManager", | 17 : ProfileKeyedServiceFactory("SigninManager", |
17 ProfileDependencyManager::GetInstance()) { | 18 ProfileDependencyManager::GetInstance()) { |
18 DependsOn(TokenServiceFactory::GetInstance()); | 19 DependsOn(TokenServiceFactory::GetInstance()); |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 PrefRegistrySyncable::UNSYNCABLE_PREF); | 72 PrefRegistrySyncable::UNSYNCABLE_PREF); |
72 } | 73 } |
73 | 74 |
74 // static | 75 // static |
75 void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) { | 76 void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) { |
76 registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, | 77 registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, |
77 std::string()); | 78 std::string()); |
78 } | 79 } |
79 | 80 |
80 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( | 81 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( |
81 content::BrowserContext* profile) const { | 82 content::BrowserContext* context) const { |
82 SigninManagerBase* service = NULL; | 83 SigninManagerBase* service = NULL; |
| 84 Profile* profile = static_cast<Profile*>(context); |
83 #if defined(OS_CHROMEOS) | 85 #if defined(OS_CHROMEOS) |
84 service = new SigninManagerBase(); | 86 service = new SigninManagerBase(); |
85 #else | 87 #else |
86 service = new SigninManager(); | 88 service = new SigninManager( |
| 89 scoped_ptr<SigninManagerDelegate>( |
| 90 new ChromeSigninManagerDelegate(profile))); |
87 #endif | 91 #endif |
88 service->Initialize(static_cast<Profile*>(profile)); | 92 service->Initialize(profile); |
89 return service; | 93 return service; |
90 } | 94 } |
OLD | NEW |