| 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 {
|
|
|