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

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

Issue 10534075: [sync] Make SetSetupInProgress kick sync engine when needed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove call to SetSyncSetupCompleted, and change kick-mechanism Created 8 years, 6 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
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 29baed146164e547578e3f2d3d73e5342d941367..3f00d89bd64546bf8560d9f8f29a6405899e4295 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -35,7 +35,7 @@ OneClickSigninSyncStarter::OneClickSigninSyncStarter(
ProfileSyncServiceFactory::GetForProfile(profile_);
// 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->set_setup_in_progress(true);
+ profile_sync_service->SetSetupInProgress(true);
SigninManager* manager = SigninManagerFactory::GetForProfile(profile_);
manager->StartSignInWithCredentials(session_index, email, password);
}
@@ -50,7 +50,7 @@ void OneClickSigninSyncStarter::SigninFailed(
const GoogleServiceAuthError& error) {
ProfileSyncService* profile_sync_service =
ProfileSyncServiceFactory::GetForProfile(profile_);
- profile_sync_service->set_setup_in_progress(false);
+ profile_sync_service->SetSetupInProgress(false);
delete this;
}
@@ -61,7 +61,7 @@ void OneClickSigninSyncStarter::SigninSuccess() {
if (start_mode_ == SYNC_WITH_DEFAULT_SETTINGS) {
// Just kick off the sync machine, no need to configure it first.
profile_sync_service->SetSyncSetupCompleted();
- profile_sync_service->set_setup_in_progress(false);
+ profile_sync_service->SetSetupInProgress(false);
profile_sync_service->UnsuppressAndStart();
} else {
// Give the user a chance to configure things. We don't clear the
« no previous file with comments | « chrome/browser/sync/profile_sync_service_startup_unittest.cc ('k') | chrome/browser/ui/webui/sync_setup_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698