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 "chrome/browser/prefs/pref_registry_simple.h" | |
7 #include "chrome/browser/prefs/pref_service.h" | 8 #include "chrome/browser/prefs/pref_service.h" |
Mattias Nissler (ping if slow)
2013/01/31 14:50:45
needed?
Jói
2013/01/31 16:23:37
Done.
| |
8 #include "chrome/browser/profiles/profile_dependency_manager.h" | 9 #include "chrome/browser/profiles/profile_dependency_manager.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 | 14 |
14 SigninManagerFactory::SigninManagerFactory() | 15 SigninManagerFactory::SigninManagerFactory() |
15 : ProfileKeyedServiceFactory("SigninManager", | 16 : ProfileKeyedServiceFactory("SigninManager", |
16 ProfileDependencyManager::GetInstance()) { | 17 ProfileDependencyManager::GetInstance()) { |
17 DependsOn(TokenServiceFactory::GetInstance()); | 18 DependsOn(TokenServiceFactory::GetInstance()); |
(...skipping 29 matching lines...) Expand all Loading... | |
47 user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true, | 48 user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true, |
48 PrefServiceSyncable::UNSYNCABLE_PREF); | 49 PrefServiceSyncable::UNSYNCABLE_PREF); |
49 user_prefs->RegisterListPref(prefs::kReverseAutologinRejectedEmailList, | 50 user_prefs->RegisterListPref(prefs::kReverseAutologinRejectedEmailList, |
50 new ListValue, | 51 new ListValue, |
51 PrefServiceSyncable::UNSYNCABLE_PREF); | 52 PrefServiceSyncable::UNSYNCABLE_PREF); |
52 user_prefs->RegisterBooleanPref(prefs::kIsGooglePlusUser, false, | 53 user_prefs->RegisterBooleanPref(prefs::kIsGooglePlusUser, false, |
53 PrefServiceSyncable::UNSYNCABLE_PREF); | 54 PrefServiceSyncable::UNSYNCABLE_PREF); |
54 } | 55 } |
55 | 56 |
56 // static | 57 // static |
57 void SigninManagerFactory::RegisterPrefs(PrefServiceSimple* local_state) { | 58 void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) { |
58 local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, ""); | 59 registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, ""); |
59 } | 60 } |
60 | 61 |
61 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( | 62 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( |
62 Profile* profile) const { | 63 Profile* profile) const { |
63 SigninManager* service = new SigninManager(); | 64 SigninManager* service = new SigninManager(); |
64 service->Initialize(profile); | 65 service->Initialize(profile); |
65 return service; | 66 return service; |
66 } | 67 } |
OLD | NEW |