Chromium Code Reviews| Index: chrome/browser/ui/webui/sync_setup_handler.cc |
| diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc |
| index c90eb14fbc15100bc4c3ce56e6cde3e1e48e0a0c..6200637e03cce8090112c017177c6b870286493a 100644 |
| --- a/chrome/browser/ui/webui/sync_setup_handler.cc |
| +++ b/chrome/browser/ui/webui/sync_setup_handler.cc |
| @@ -869,11 +869,13 @@ void SyncSetupHandler::CloseSyncSetup() { |
| // and shut down sync. |
| if (sync_service && !sync_service->HasSyncSetupCompleted()) { |
| DVLOG(1) << "Signin aborted by user action"; |
| + // Calling DisableForUser() will also sign the user out on desktop |
| + // platforms. |
|
Roger Tawa OOO till Jul 10th
2012/06/04 13:43:40
nit: the comment is not completely accurate, since
Andrew T Wilson (Slow)
2012/06/04 16:06:26
Hmmm. I was trying to be explicit by saying "deskt
|
| sync_service->DisableForUser(); |
| -#if !defined(OS_CHROMEOS) |
| - GetSignin()->SignOut(); |
| -#else |
| - // TODO(atwilson): Move this suppression to PSS::DisableForUser() |
| + |
| +#if defined(OS_CHROMEOS) |
| + // Suppress sync startup on ChromeOS, so it doesn't get restarted when |
| + // the user logs in again. |
| browser_sync::SyncPrefs sync_prefs(GetProfile()->GetPrefs()); |
| sync_prefs.SetStartSuppressed(true); |
| #endif |