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

Unified Diff: chrome/browser/ui/sync/one_click_signin_sync_starter.cc

Issue 10885011: Its possible for sync to be suppressed before the user attempts one-click (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/sync/one_click_signin_sync_starter.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
index 62e8019a6a9767e19c8cfe8aa81c78124ece84c5..260645a6d6ff2653933bc0d25984ff380a906787 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -29,6 +29,7 @@ OneClickSigninSyncStarter::OneClickSigninSyncStarter(
// Let the sync service know that setup is in progress so it doesn't start
// syncing until the user has finished any configuration.
profile_sync_service->SetSetupInProgress(true);
+ profile_sync_service->UnsuppressAndStart();
Roger Tawa OOO till Jul 10th 2012/08/28 17:21:55 Tim: should I call SyncPrefs::SetStartSuppressed()
tim (not reviewing) 2012/08/29 18:02:26 The difference is that UnsuppressAndStart will try
Roger Tawa OOO till Jul 10th 2012/08/29 18:58:43 Yes we do get here for the advanced case too. The
tim (not reviewing) 2012/08/29 23:48:58 Hm, maybe my new suggestion is a bad idea, we can'
SigninManager* manager = SigninManagerFactory::GetForProfile(
browser_->profile());
manager->StartSignInWithCredentials(session_index, email, password);
@@ -56,7 +57,6 @@ void OneClickSigninSyncStarter::SigninSuccess() {
// Just kick off the sync machine, no need to configure it first.
profile_sync_service->SetSyncSetupCompleted();
profile_sync_service->SetSetupInProgress(false);
- profile_sync_service->UnsuppressAndStart();
tim (not reviewing) 2012/08/29 23:48:58 Hm, I'm a little confused. SigninSuccess is suppo
} else {
// Give the user a chance to configure things. We don't clear the
// ProfileSyncService::setup_in_progress flag because we don't want sync
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698