| Index: chrome/browser/sync/profile_sync_service.cc
|
| ===================================================================
|
| --- chrome/browser/sync/profile_sync_service.cc (revision 62207)
|
| +++ chrome/browser/sync/profile_sync_service.cc (working copy)
|
| @@ -646,7 +646,7 @@
|
| return;
|
| }
|
| wizard_.SetParent(parent_window);
|
| - wizard_.Step(SyncSetupWizard::CHOOSE_DATA_TYPES);
|
| + wizard_.Step(SyncSetupWizard::CONFIGURE);
|
| }
|
|
|
| SyncBackendHost::StatusSummary ProfileSyncService::QuerySyncStatusSummary() {
|
| @@ -836,6 +836,15 @@
|
| }
|
| }
|
|
|
| +bool ProfileSyncService::IsUsingSecondaryPassphrase() const {
|
| + return profile_->GetPrefs()->GetBoolean(prefs::kSyncUsingSecondaryPassphrase);
|
| +}
|
| +
|
| +void ProfileSyncService::SetSecondaryPassphrase(const std::string& passphrase) {
|
| + SetPassphrase(passphrase);
|
| + profile_->GetPrefs()->SetBoolean(prefs::kSyncUsingSecondaryPassphrase, true);
|
| +}
|
| +
|
| bool ProfileSyncService::IsCryptographerReady() const {
|
| return backend_.get() && backend_->IsCryptographerReady();
|
| }
|
| @@ -931,9 +940,12 @@
|
| break;
|
| }
|
|
|
| - // TODO(sync): Show the passphrase UI here.
|
| - UpdateAuthErrorState(GoogleServiceAuthError(
|
| - GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS));
|
| + if (SetupInProgress()) {
|
| + wizard_.Step(SyncSetupWizard::ENTER_PASSPHRASE);
|
| + } else {
|
| + UpdateAuthErrorState(GoogleServiceAuthError(
|
| + GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS));
|
| + }
|
| break;
|
| }
|
| case NotificationType::SYNC_DATA_TYPES_UPDATED: {
|
|
|