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 16 matching lines...) Expand all Loading... |
27 SigninManager* SigninManagerFactory::GetForProfileIfExists(Profile* profile) { | 27 SigninManager* SigninManagerFactory::GetForProfileIfExists(Profile* profile) { |
28 return static_cast<SigninManager*>( | 28 return static_cast<SigninManager*>( |
29 GetInstance()->GetServiceForProfile(profile, false)); | 29 GetInstance()->GetServiceForProfile(profile, false)); |
30 } | 30 } |
31 | 31 |
32 // static | 32 // static |
33 SigninManagerFactory* SigninManagerFactory::GetInstance() { | 33 SigninManagerFactory* SigninManagerFactory::GetInstance() { |
34 return Singleton<SigninManagerFactory>::get(); | 34 return Singleton<SigninManagerFactory>::get(); |
35 } | 35 } |
36 | 36 |
37 void SigninManagerFactory::RegisterUserPrefs(PrefService* user_prefs) { | 37 void SigninManagerFactory::RegisterUserPrefs(PrefServiceSyncable* user_prefs) { |
38 user_prefs->RegisterStringPref(prefs::kGoogleServicesLastUsername, "", | 38 user_prefs->RegisterStringPref(prefs::kGoogleServicesLastUsername, "", |
39 PrefService::UNSYNCABLE_PREF); | 39 PrefServiceSyncable::UNSYNCABLE_PREF); |
40 user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername, "", | 40 user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername, "", |
41 PrefService::UNSYNCABLE_PREF); | 41 PrefServiceSyncable::UNSYNCABLE_PREF); |
42 user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true, | 42 user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true, |
43 PrefService::UNSYNCABLE_PREF); | 43 PrefServiceSyncable::UNSYNCABLE_PREF); |
44 user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true, | 44 user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true, |
45 PrefService::UNSYNCABLE_PREF); | 45 PrefServiceSyncable::UNSYNCABLE_PREF); |
46 user_prefs->RegisterListPref(prefs::kReverseAutologinRejectedEmailList, | 46 user_prefs->RegisterListPref(prefs::kReverseAutologinRejectedEmailList, |
47 new ListValue, PrefService::UNSYNCABLE_PREF); | 47 new ListValue, |
| 48 PrefServiceSyncable::UNSYNCABLE_PREF); |
48 user_prefs->RegisterBooleanPref(prefs::kIsGooglePlusUser, false, | 49 user_prefs->RegisterBooleanPref(prefs::kIsGooglePlusUser, false, |
49 PrefService::UNSYNCABLE_PREF); | 50 PrefServiceSyncable::UNSYNCABLE_PREF); |
50 } | 51 } |
51 | 52 |
52 // static | 53 // static |
53 void SigninManagerFactory::RegisterPrefs(PrefService* local_state) { | 54 void SigninManagerFactory::RegisterPrefs(PrefServiceSimple* local_state) { |
54 local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, "", | 55 local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, ""); |
55 PrefService::UNSYNCABLE_PREF); | |
56 } | 56 } |
57 | 57 |
58 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( | 58 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( |
59 Profile* profile) const { | 59 Profile* profile) const { |
60 SigninManager* service = new SigninManager(); | 60 SigninManager* service = new SigninManager(); |
61 service->Initialize(profile); | 61 service->Initialize(profile); |
62 return service; | 62 return service; |
63 } | 63 } |
OLD | NEW |