Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10002)

Unified Diff: chrome/browser/sync/signin_manager.cc

Issue 7740083: Put pre- and auto-login behind flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/autologin_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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()));
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/autologin_infobar_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698