Add UI for setting the encryption passphrase....

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/profile_sync_service.h"
 
 #include <map>
 #include <set>
 
 #include "app/l10n_util.h"
@@ skipping 628 matching lines @@
 
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
 }
 
 void ProfileSyncService::ShowChooseDataTypes(gfx::NativeWindow parent_window) {
   if (WizardIsVisible()) {
     wizard_.Focus();
     return;
   }
   wizard_.SetParent(parent_window);
-  wizard_.Step(SyncSetupWizard::CHOOSE_DATA_TYPES);
+  wizard_.Step(SyncSetupWizard::CONFIGURE);
 }
 
 SyncBackendHost::StatusSummary ProfileSyncService::QuerySyncStatusSummary() {
   if (backend_.get() && backend_initialized_)
     return backend_->GetStatusSummary();
   else
     return SyncBackendHost::Status::OFFLINE_UNUSABLE;
 }
 
 SyncBackendHost::Status ProfileSyncService::QueryDetailedSyncStatus() {
@@ skipping 169 matching lines @@
   registered_types->clear();
   // The data_type_controllers_ are determined by command-line flags; that's
   // effectively what controls the values returned here.
   for (DataTypeController::TypeMap::const_iterator it =
        data_type_controllers_.begin();
        it != data_type_controllers_.end(); ++it) {
     registered_types->insert((*it).first);
   }
 }
 
+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();
 }
 
 void ProfileSyncService::ConfigureDataTypeManager() {
   if (!data_type_manager_.get()) {
     data_type_manager_.reset(
         factory_->CreateDataTypeManager(backend_.get(),
                                         data_type_controllers_));
     registrar_.Add(this,
@@ skipping 75 matching lines @@
       DCHECK(backend_.get());
       DCHECK(backend_->IsNigoriEnabled());
       observed_passphrase_required_ = true;
 
       if (!cached_passphrase_.empty()) {
         SetPassphrase(cached_passphrase_);
         cached_passphrase_.clear();
         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: {
       if (!HasSyncSetupCompleted()) break;
 
       syncable::ModelTypeSet types;
       GetPreferredDataTypes(&types);
       OnUserChoseDatatypes(false, types);
       break;
     }
@@ skipping 89 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }