| 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 9b5406fefd9c712e359a081405dd66f693c7a47b..00e9a9bc6aec098353fd80c3bb18166c9af59d5e 100644
|
| --- a/chrome/browser/signin/signin_manager_factory.cc
|
| +++ b/chrome/browser/signin/signin_manager_factory.cc
|
| @@ -12,9 +12,7 @@
|
| #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h"
|
| #include "chrome/browser/signin/local_auth.h"
|
| #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
|
| -#include "chrome/common/pref_names.h"
|
| #include "components/keyed_service/content/browser_context_dependency_manager.h"
|
| -#include "components/pref_registry/pref_registry_syncable.h"
|
| #include "components/signin/core/browser/signin_manager.h"
|
|
|
| SigninManagerFactory::SigninManagerFactory()
|
| @@ -81,35 +79,13 @@ SigninManagerFactory* SigninManagerFactory::GetInstance() {
|
|
|
| void SigninManagerFactory::RegisterProfilePrefs(
|
| user_prefs::PrefRegistrySyncable* registry) {
|
| - registry->RegisterStringPref(prefs::kGoogleServicesHostedDomain,
|
| - std::string());
|
| - registry->RegisterStringPref(prefs::kGoogleServicesLastUsername,
|
| - std::string());
|
| - registry->RegisterInt64Pref(
|
| - prefs::kGoogleServicesRefreshTokenAnnotateScheduledTime,
|
| - base::Time().ToInternalValue());
|
| - registry->RegisterStringPref(prefs::kGoogleServicesSigninScopedDeviceId,
|
| - std::string());
|
| - registry->RegisterStringPref(prefs::kGoogleServicesAccountId, std::string());
|
| - registry->RegisterStringPref(prefs::kGoogleServicesUserAccountId,
|
| - std::string());
|
| - registry->RegisterBooleanPref(prefs::kAutologinEnabled, true);
|
| - registry->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true);
|
| - registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList,
|
| - new base::ListValue);
|
| - registry->RegisterInt64Pref(prefs::kSignedInTime,
|
| - base::Time().ToInternalValue());
|
| -
|
| + SigninManagerBase::RegisterProfilePrefs(registry);
|
| LocalAuth::RegisterLocalAuthPrefs(registry);
|
| -
|
| - // Deprecated prefs: will be removed in a future release.
|
| - registry->RegisterStringPref(prefs::kGoogleServicesUsername, std::string());
|
| }
|
|
|
| // static
|
| void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) {
|
| - registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern,
|
| - std::string());
|
| + SigninManagerBase::RegisterPrefs(registry);
|
| }
|
|
|
| void SigninManagerFactory::AddObserver(Observer* observer) {
|
|
|