[Sync] Support receiving early passphrase required information in Sync UI.

chrome/browser/resources/options/sync_setup_overlay.js

 // Copyright (c) 2011 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.
 
 cr.define('options', function() {
   const OptionsPage = options.OptionsPage;
 
   // Variable to track if a captcha challenge was issued. If this gets set to
   // true, it stays that way until we are told about successful login from
   // the browser.  This means subsequent errors (like invalid password) are
@@ skipping 76 matching lines @@
     /** @inheritDoc */
     didShowPage: function() {
       chrome.send('SyncSetupAttachHandler');
     },
 
     /** @inheritDoc */
     didClosePage: function() {
       chrome.send('SyncSetupDidClosePage');
     },
 
-    sendPassphraseAndClose_: function() {
-      var f = $('choose-data-types-form');
-      var result = JSON.stringify({"passphrase": f.passphrase.value});
-      chrome.send('SyncSetupPassphrase', [result]);
-      return false;
-    },
-
     getEncryptionRadioCheckedValue_: function() {
       var f = $('choose-data-types-form');
       for (var i = 0; i < f.encrypt.length; ++i) {
         if (f.encrypt[i].checked) {
           return f.encrypt[i].value;
         }
       }
 
       return undefined;
     },
@@ skipping 71 matching lines @@
     },
 
     checkPassphraseMatch_: function() {
       var emptyError = $('empty-error');
       var mismatchError = $('mismatch-error');
       emptyError.hidden = true;
       mismatchError.hidden = true;
 
       var f = $('choose-data-types-form');
       if (this.getPassphraseRadioCheckedValue_() != "explicit" ||
-          f.option[0].disabled)
+          $('google-option').disabled) {
         return true;
+      }
 
       var customPassphrase = $('custom-passphrase');
       if (customPassphrase.value.length == 0) {
         emptyError.hidden = false;
         return false;
       }
 
       var confirmPassphrase = $('confirm-passphrase');
       if (confirmPassphrase.value != customPassphrase.value) {
         mismatchError.hidden = false;
         return false;
       }
 
       return true;
     },
 
     sendConfiguration_: function() {
       // Trying to submit, so hide previous errors.
       $('aborted-text').hidden = true;
       $('error-text').hidden = true;
 
       if (this.noDataTypesChecked_()) {
         $('error-text').hidden = false;
         return;
       }
 
       var f = $('choose-data-types-form');
-      if (!this.checkPassphraseMatch_())
+      // Must be done before we disable input elements.
+      if (!this.checkPassphraseMatch_()) {

[James Hawkins, 2011/07/21 19:20:09]

No braces for single-line logic blocks, here and elsewhere.

[Nicolas Zea, 2011/07/21 19:34:57]

Done.

         return;
+      }
 
       // Don't allow the user to tweak the settings once we send the
       // configuration to the backend.
       this.setInputElementsDisabledState_(true);
 
       var syncAll =
         document.getElementById('sync-select-datatypes').selectedIndex == 0;
       var usePassphrase = this.getPassphraseRadioCheckedValue_() == 'explicit';
       var encryptAllData = this.getEncryptionRadioCheckedValue_() == 'all';
 
+      var customPassphrase = "";

[James Hawkins, 2011/07/21 19:20:09]

No need to initialize to empty string.

[Nicolas Zea, 2011/07/21 19:34:57]

Done.

+      if (!$('sync-existing-passphrase-container').hidden) {
+        // We were prompted for an existing passphrase, use it.
+        customPassphrase = f.passphrase.value;
+      } else {
+        customPassphrase = $('custom-passphrase').value;
+      }
+
+      // If the user has not actually entered a passphrase (for example on
+      // customize when the passphrase box is hidden), we don't attempt to reset
+      // the passphrase.
+      if (customPassphrase.length == 0) {
+        usePassphrase = false;
+      }
+
       // These values need to be kept in sync with where they are read in
       // SyncSetupFlow::GetDataTypeChoiceData().
       var result = JSON.stringify({
           "keepEverythingSynced": syncAll,
           "syncBookmarks": syncAll || $('bookmarks-checkbox').checked,
           "syncPreferences": syncAll || $('preferences-checkbox').checked,
           "syncThemes": syncAll || $('themes-checkbox').checked,
           "syncPasswords": syncAll || $('passwords-checkbox').checked,
           "syncAutofill": syncAll || $('autofill-checkbox').checked,
           "syncExtensions": syncAll || $('extensions-checkbox').checked,
           "syncTypedUrls": syncAll || $('typed-urls-checkbox').checked,
           "syncApps": syncAll || $('apps-checkbox').checked,
           "syncSessions": syncAll || $('sessions-checkbox').checked,
           "encryptAllData": encryptAllData,
           "usePassphrase": usePassphrase,
-          "passphrase": $('custom-passphrase').value
+          "passphrase": customPassphrase
       });
       chrome.send('SyncSetupConfigure', [result]);
     },
 
     /**
      * Sets the disabled property of all input elements within the 'Customize
      * Sync Preferences' screen. This is used to prohibit the user from changing
      * the inputs after confirming the customized sync preferences, or resetting
      * the state when re-showing the dialog.
      * @param disabled True if controls should be set to disabled.
@@ skipping 177 matching lines @@
       // passphrase radio when switching to the 'Sync everything' page.
       if (!this.usePassphrase_) {
         $('google-option').checked = true;
         $('sync-custom-passphrase').hidden = true;
       }
 
       $('confirm-everything-ok').focus();
     },
 
     /**
-     * Reveals the UI for entering a custom passphrase after initial setup. This
-     * may happen if the user forgot to enter the correct (or any) custom
-     * passphrase during initial setup.
+     * Reveals the UI for entering a custom passphrase during initial setup.
+     * This happens if the user has previously enabled a custom passphrase on a
+     * different machine.
      * @param {Array} args The args that contain the passphrase UI
      *     configuration.
      * @private
      */
     showPassphraseContainer_: function(args) {
-      $('choose-data-types-form').onsubmit =
-          this.sendPassphraseAndClose_.bind(this);
       $('sync-custom-passphrase-container').hidden = true;
       $('sync-existing-passphrase-container').hidden = false;
 
       if (args["passphrase_creation_rejected"])
         $('passphrase-rejected-body').hidden = false;
       else
         $('normal-body').hidden = false;
 
       if (args["passphrase_setting_rejected"])
         $('incorrect-passphrase').hidden = false;
@@ skipping 323 matching lines @@
 
   SyncSetupOverlay.showStopSyncingUI = function() {
     SyncSetupOverlay.getInstance().showStopSyncingUI_();
   };
 
   // Export
   return {
     SyncSetupOverlay: SyncSetupOverlay
   };
 });