Further tweaks to the passphrase UI to deal with passphrase entry....

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>
@@ skipping 89 matching lines @@
   virtual bool IsDialogModal() const;
   virtual bool ShouldShowDialogTitle() const;
 
   void OnUserSubmittedAuth(const std::string& username,
                            const std::string& password,
                            const std::string& captcha,
                            const std::string& access_code);
 
   void OnUserConfigured(const SyncConfiguration& configuration);
 
-  void OnPassphraseEntry(const std::string& passphrase,
-                         const std::string& mode);
+  void OnPassphraseEntry(const std::string& passphrase);
 
   void OnFirstPassphraseEntry(const std::string& option,

[tim (not reviewing), 2011/01/13 21:31:59]

Could you add a comment here to distinguish these two entry methods?  Does
'first' correspond to a specific piece of UI or just physically the first time?

                               const std::string& passphrase);
 
   void OnGoToDashboard();
 
  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);
@@ skipping 92 matching lines @@
   }
 
  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_