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

chrome/browser/sync/sync_setup_wizard.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/sync_setup_wizard.h"
 
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "chrome/browser/browser_thread.h"
@@ skipping 153 matching lines @@
     AddString(dict, "cleardata", IDS_SYNC_CLEAR_DATA_FOR_PASSPHRASE);
     AddString(dict, "cleardatalink", IDS_SYNC_CLEAR_DATA_LINK);
 
     // Stuff for the footer.
     AddString(dict, "ok", IDS_OK);
     AddString(dict, "cancel", IDS_CANCEL);
   } else if (path_raw == kSyncPassphrasePath) {
     html_resource_id = IDR_SYNC_PASSPHRASE_HTML;
     AddString(dict, "enterPassphraseTitle", IDS_SYNC_ENTER_PASSPHRASE_TITLE);
     AddString(dict, "enterPassphraseBody", IDS_SYNC_ENTER_PASSPHRASE_BODY);
+    AddString(dict, "enterOtherPassphraseBody",
+              IDS_SYNC_ENTER_OTHER_PASSPHRASE_BODY);
     AddString(dict, "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL);
+    AddString(dict, "incorrectPassphrase", IDS_SYNC_INCORRECT_PASSPHRASE);
+    AddString(dict, "passphraseRecover", IDS_SYNC_PASSPHRASE_RECOVER);
+    AddString(dict, "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING);
+    AddString(dict, "cleardatalink", IDS_SYNC_CLEAR_DATA_LINK);
+
     AddString(dict, "ok", IDS_OK);
     AddString(dict, "cancel", IDS_CANCEL);
-
-    AddString(dict, "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING);
-    AddString(dict, "cleardatalink", IDS_SYNC_CLEAR_DATA_LINK);
   } else if (path_raw == kSyncFirstPassphrasePath) {
     html_resource_id = IDR_SYNC_FIRST_PASSPHRASE_HTML;
     AddString(dict, "title", IDS_SYNC_FIRST_PASSPHRASE_TITLE);
     dict->SetString("instructions",
                     GetStringFUTF16(IDS_SYNC_FIRST_PASSPHRASE_MESSAGE,
                                     GetStringUTF16(IDS_PRODUCT_NAME)));
     AddString(dict, "googleOption", IDS_SYNC_PASSPHRASE_OPT_GOOGLE);
     AddString(dict, "explicitOption", IDS_SYNC_PASSPHRASE_OPT_EXPLICIT);
     AddString(dict, "nothanksOption", IDS_SYNC_PASSPHRASE_OPT_CANCEL);
     AddString(dict, "sectionGoogleMessage", IDS_SYNC_PASSPHRASE_MSG_GOOGLE);
@@ skipping 120 matching lines @@
     result = GAIA_SUCCESS;
   } else if (start_state == ENTER_PASSPHRASE ||
              start_state == CONFIGURE ||
              start_state == PASSPHRASE_MIGRATION) {
     result = DONE;
   }
   DCHECK_NE(FATAL_ERROR, result) <<
       "Invalid start state for discrete run: " << start_state;
   return result;
 }