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_service.h" | 7 #include "chrome/browser/prefs/pref_service.h" |
8 #include "chrome/browser/profiles/profile_dependency_manager.h" | 8 #include "chrome/browser/profiles/profile_dependency_manager.h" |
9 #include "chrome/browser/signin/signin_manager.h" | 9 #include "chrome/browser/signin/signin_manager.h" |
10 #include "chrome/browser/signin/token_service_factory.h" | 10 #include "chrome/browser/signin/token_service_factory.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 return Singleton<SigninManagerFactory>::get(); | 29 return Singleton<SigninManagerFactory>::get(); |
30 } | 30 } |
31 | 31 |
32 void SigninManagerFactory::RegisterUserPrefs(PrefService* user_prefs) { | 32 void SigninManagerFactory::RegisterUserPrefs(PrefService* user_prefs) { |
33 user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername, "", | 33 user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername, "", |
34 PrefService::UNSYNCABLE_PREF); | 34 PrefService::UNSYNCABLE_PREF); |
35 user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true, | 35 user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true, |
36 PrefService::UNSYNCABLE_PREF); | 36 PrefService::UNSYNCABLE_PREF); |
37 user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true, | 37 user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true, |
38 PrefService::UNSYNCABLE_PREF); | 38 PrefService::UNSYNCABLE_PREF); |
| 39 user_prefs->RegisterListPref(prefs::kReverseAutologinRejectedEmailList, |
| 40 new ListValue, PrefService::UNSYNCABLE_PREF); |
39 user_prefs->RegisterBooleanPref(prefs::kIsGooglePlusUser, false, | 41 user_prefs->RegisterBooleanPref(prefs::kIsGooglePlusUser, false, |
40 PrefService::UNSYNCABLE_PREF); | 42 PrefService::UNSYNCABLE_PREF); |
41 } | 43 } |
42 | 44 |
43 // static | 45 // static |
44 void SigninManagerFactory::RegisterPrefs(PrefService* local_state) { | 46 void SigninManagerFactory::RegisterPrefs(PrefService* local_state) { |
45 local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, "", | 47 local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, "", |
46 PrefService::UNSYNCABLE_PREF); | 48 PrefService::UNSYNCABLE_PREF); |
47 } | 49 } |
48 | 50 |
49 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( | 51 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( |
50 Profile* profile) const { | 52 Profile* profile) const { |
51 SigninManager* service = new SigninManager(); | 53 SigninManager* service = new SigninManager(); |
52 service->Initialize(profile); | 54 service->Initialize(profile); |
53 return service; | 55 return service; |
54 } | 56 } |
OLD | NEW |