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/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 21 matching lines...) Expand all Loading... |
32 return static_cast<SigninManager*>( | 32 return static_cast<SigninManager*>( |
33 GetInstance()->GetServiceForProfile(profile, false)); | 33 GetInstance()->GetServiceForProfile(profile, false)); |
34 } | 34 } |
35 | 35 |
36 // static | 36 // static |
37 SigninManagerFactory* SigninManagerFactory::GetInstance() { | 37 SigninManagerFactory* SigninManagerFactory::GetInstance() { |
38 return Singleton<SigninManagerFactory>::get(); | 38 return Singleton<SigninManagerFactory>::get(); |
39 } | 39 } |
40 | 40 |
41 void SigninManagerFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) { | 41 void SigninManagerFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) { |
42 registry->RegisterStringPref(prefs::kGoogleServicesLastUsername, "", | 42 registry->RegisterStringPref(prefs::kGoogleServicesLastUsername, |
| 43 std::string(), |
43 PrefRegistrySyncable::UNSYNCABLE_PREF); | 44 PrefRegistrySyncable::UNSYNCABLE_PREF); |
44 registry->RegisterStringPref(prefs::kGoogleServicesUsername, "", | 45 registry->RegisterStringPref(prefs::kGoogleServicesUsername, |
| 46 std::string(), |
45 PrefRegistrySyncable::UNSYNCABLE_PREF); | 47 PrefRegistrySyncable::UNSYNCABLE_PREF); |
46 registry->RegisterBooleanPref(prefs::kAutologinEnabled, true, | 48 registry->RegisterBooleanPref(prefs::kAutologinEnabled, true, |
47 PrefRegistrySyncable::UNSYNCABLE_PREF); | 49 PrefRegistrySyncable::UNSYNCABLE_PREF); |
48 registry->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true, | 50 registry->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true, |
49 PrefRegistrySyncable::UNSYNCABLE_PREF); | 51 PrefRegistrySyncable::UNSYNCABLE_PREF); |
50 registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList, | 52 registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList, |
51 new ListValue, | 53 new ListValue, |
52 PrefRegistrySyncable::UNSYNCABLE_PREF); | 54 PrefRegistrySyncable::UNSYNCABLE_PREF); |
53 } | 55 } |
54 | 56 |
55 // static | 57 // static |
56 void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) { | 58 void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) { |
57 registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, ""); | 59 registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, |
| 60 std::string()); |
58 } | 61 } |
59 | 62 |
60 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( | 63 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( |
61 Profile* profile) const { | 64 Profile* profile) const { |
62 SigninManager* service = new SigninManager(); | 65 SigninManager* service = new SigninManager(); |
63 service->Initialize(profile); | 66 service->Initialize(profile); |
64 return service; | 67 return service; |
65 } | 68 } |
OLD | NEW |