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

Unified Diff: chrome/browser/ui/webui/sync_setup_handler.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
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_sync_starter.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 dfc6dfe0c6e8d2861626ddb94dea95b1c7959791..94d4eda98ffc6c2fa11f282131193cce448beed7 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -862,7 +862,7 @@ void SyncSetupHandler::CloseSyncSetup() {
// Let the various services know that we're no longer active.
GetLoginUIService()->LoginUIClosed(this);
if (sync_service)
- sync_service->set_setup_in_progress(false);
+ sync_service->SetSetupInProgress(false);
// Make sure user isn't left half-logged-in (signed in, but without sync
// started up). If the user hasn't finished setting up sync, then sign out
@@ -912,7 +912,7 @@ void SyncSetupHandler::OpenSyncSetup(bool force_login) {
// Notify services that we are now active.
GetLoginUIService()->SetLoginUI(this);
- service->set_setup_in_progress(true);
+ service->SetSetupInProgress(true);
// There are several different UI flows that can bring the user here:
// 1) Signin promo (passes force_login=true)
@@ -955,7 +955,7 @@ void SyncSetupHandler::PrepareConfigDialog() {
signin_tracker_.reset(
new SigninTracker(GetProfile(), this,
SigninTracker::SERVICES_INITIALIZING));
- service->set_setup_in_progress(true);
+ service->SetSetupInProgress(true);
service->UnsuppressAndStart();
DisplaySpinner();
} else {
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_sync_starter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698