Add UI for setting the encryption passphrase....

chrome/browser/sync/sync_setup_flow.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_
 #define CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/gtest_prod_util.h"
 #include "base/time.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_wizard.h"
+#include "chrome/browser/sync/syncable/model_type.h"
 #include "gfx/native_widget_types.h"
 #include "grit/generated_resources.h"
 
 class FlowHandler;
 class SyncSetupFlowContainer;
 
+// A structure which contains all the configuration information for sync.
+// This can be stored or passed around when the configuration is managed
+// by multiple stages of the wizard.
+struct SyncConfiguration {
+  bool sync_everything;
+  syncable::ModelTypeSet data_types;
+  bool use_secondary_passphrase;
+  std::string secondary_passphrase;
+};
+
 // The state machine used by SyncSetupWizard, exposed in its own header
 // to facilitate testing of SyncSetupWizard.  This class is used to open and
 // run the html dialog and deletes itself when the dialog closes.
 class SyncSetupFlow : public HtmlDialogUIDelegate {
  public:
   virtual ~SyncSetupFlow();
 
   // Runs a flow from |start| to |end|, and does the work of actually showing
   // the HTML dialog.  |container| is kept up-to-date with the lifetime of the
   // flow (e.g it is emptied on dialog close).
   static SyncSetupFlow* Run(ProfileSyncService* service,
                             SyncSetupFlowContainer* container,
                             SyncSetupWizard::State start,
                             SyncSetupWizard::State end,
                             gfx::NativeWindow parent_window);
 
   // Fills |args| with "user" and "error" arguments by querying |service|.
   static void GetArgsForGaiaLogin(
       const ProfileSyncService* service,
       DictionaryValue* args);
 
-  // Fills |args| with "user" and "error" arguments by querying |service|.
-  static void GetArgsForChooseDataTypes(
+  // Fills |args| for the configure screen (Choose Data Types/Encryption)
+  static void GetArgsForConfigure(
       ProfileSyncService* service,
       DictionaryValue* args);
 
   // Triggers a state machine transition to advance_state.
   void Advance(SyncSetupWizard::State advance_state);
 
   // Focuses the dialog.  This is useful in cases where the dialog has been
   // obscured by a browser window.
   void Focus();
 
@@ skipping 30 matching lines @@
   }
 
   // HtmlDialogUIDelegate implementation.
   virtual bool IsDialogModal() const {
     return false;
   }
 
   void OnUserSubmittedAuth(const std::string& username,
                            const std::string& password,
                            const std::string& captcha,
-                           const std::string& access_code) {
-    service_->OnUserSubmittedAuth(username, password, captcha, access_code);
-  }
+                           const std::string& access_code);
 
-  void OnUserChoseDataTypes(bool sync_everything,
-      syncable::ModelTypeSet& chosen_types) {
-    service_->OnUserChoseDatatypes(sync_everything, chosen_types);
-  }
+  void OnUserConfigured(const SyncConfiguration& configuration);
+
+  void OnPassphraseEntry(const std::string& passphrase);
+
+  void OnConfigurationComplete();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InitialStepLogin);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, ChooseDataTypesSetsPrefs);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DialogCancelled);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InvalidTransitions);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, FullSuccessfulRunSetsPref);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, AbortedByPendingClear);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DiscreteRunGaiaLogin);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DiscreteRunChooseDataTypes);
@@ skipping 17 matching lines @@
   SyncSetupWizard::State current_state_;
   SyncSetupWizard::State end_state_;  // The goal.
 
   // Time that the GAIA_LOGIN step was received.
   base::TimeTicks login_start_time_;
 
   // The handler needed for the entire flow.
   FlowHandler* flow_handler_;
   mutable bool owns_flow_handler_;
 
+  // The current configuration, held pending until all the information has
+  // been populated (possibly using multiple dialog states).
+  SyncConfiguration configuration_;
+  bool configuration_pending_;
+
   // We need this to write the sentinel "setup completed" pref.
   ProfileSyncService* service_;
 
   // Currently used only on OS X
   // TODO(akalin): Add the necessary support to the other OSes and use
   // this for them.
   gfx::NativeWindow html_dialog_window_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSetupFlow);
 };
@@ skipping 22 matching lines @@
 class FlowHandler : public DOMMessageHandler {
  public:
   FlowHandler()  {}
   virtual ~FlowHandler() {}
 
   // DOMMessageHandler implementation.
   virtual void RegisterMessages();
 
   // Callbacks from the page.
   void HandleSubmitAuth(const ListValue* args);
-  void HandleChooseDataTypes(const ListValue* args);
+  void HandleConfigure(const ListValue* args);
+  void HandlePassphraseEntry(const ListValue* args);
 
   // These functions control which part of the HTML is visible.
   void ShowGaiaLogin(const DictionaryValue& args);
   void ShowGaiaSuccessAndClose();
   void ShowGaiaSuccessAndSettingUp();
-  void ShowChooseDataTypes(const DictionaryValue& args);
+  void ShowConfigure(const DictionaryValue& args);
+  void ShowPassphraseEntry(const DictionaryValue& args);
+  void ShowSettingUp();
   void ShowSetupDone(const std::wstring& user);
   void ShowFirstTimeDone(const std::wstring& user);
 
   void set_flow(SyncSetupFlow* flow) {
     flow_ = flow;
   }
 
  private:
   void ExecuteJavascriptInIFrame(const std::wstring& iframe_xpath,
                                  const std::wstring& js);
   SyncSetupFlow* flow_;
   DISALLOW_COPY_AND_ASSIGN(FlowHandler);
 };
 
 #endif  // CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_