| Index: chrome/browser/signin/signin_manager_factory.cc
|
| diff --git a/chrome/browser/signin/signin_manager_factory.cc b/chrome/browser/signin/signin_manager_factory.cc
|
| index dec9725d579a23421d0c1b09c51a145c44b90cb8..1f10ed4082d7bfc8bec4079d09642b85c1492e5f 100644
|
| --- a/chrome/browser/signin/signin_manager_factory.cc
|
| +++ b/chrome/browser/signin/signin_manager_factory.cc
|
| @@ -55,20 +55,27 @@ SigninManagerFactory* SigninManagerFactory::GetInstance() {
|
| return Singleton<SigninManagerFactory>::get();
|
| }
|
|
|
| -void SigninManagerFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) {
|
| - registry->RegisterStringPref(prefs::kGoogleServicesLastUsername,
|
| - std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterStringPref(prefs::kGoogleServicesUsername,
|
| - std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterBooleanPref(prefs::kAutologinEnabled, true,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| +void SigninManagerFactory::RegisterUserPrefs(
|
| + user_prefs::PrefRegistrySyncable* registry) {
|
| + registry->RegisterStringPref(
|
| + prefs::kGoogleServicesLastUsername,
|
| + std::string(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(
|
| + prefs::kGoogleServicesUsername,
|
| + std::string(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterBooleanPref(
|
| + prefs::kAutologinEnabled,
|
| + true,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterBooleanPref(
|
| + prefs::kReverseAutologinEnabled,
|
| + true,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList,
|
| new ListValue,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| // static
|
|
|