Index: chrome/browser/sync/signin_manager.cc |
=================================================================== |
--- chrome/browser/sync/signin_manager.cc (revision 98807) |
+++ chrome/browser/sync/signin_manager.cc (working copy) |
@@ -136,7 +136,8 @@ |
// user when the GAIA service token is ready for use. Only do this if we |
// are not running in ChomiumOS, since it handles pre-login itself. |
#if !defined(OS_CHROMEOS) |
- if (profile_->GetPrefs()->GetBoolean(prefs::kAutologinEnabled)) { |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAutologin) && |
+ profile_->GetPrefs()->GetBoolean(prefs::kAutologinEnabled)) { |
registrar_.Add(this, |
chrome::NOTIFICATION_TOKEN_AVAILABLE, |
Source<TokenService>(profile_->GetTokenService())); |