options: prettier fix for bug 281069 that can be committed to trunk later.

options: prettier fix for bug 281069 with a test.

R=estade@chromium.org
BUG=281069
TEST=bug repro steps

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=251927

[Evan Stade, 2014-02-18 20:14:46]

lgtm

[Dan Beam, 2014-02-18 22:54:07]

The CQ bit was checked by dbeam@chromium.org

[commit-bot: I haz the power, 2014-02-18 22:55:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dbeam@chromium.org/168183002/60001

[commit-bot: I haz the power, 2014-02-18 22:55:32]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-18 22:55:32]

Failed to apply patch for chrome/browser/resources/options/language_options.js:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/resources/options/language_options.js
  Hunk #2 succeeded at 845 (offset 11 lines).
  Hunk #3 succeeded at 1189 (offset 11 lines).
  Hunk #4 succeeded at 1232 (offset 11 lines).
  Hunk #5 succeeded at 1248 (offset 11 lines).
  Hunk #6 FAILED at 1298.
  1 out of 6 hunks FAILED -- saving rejects to file
chrome/browser/resources/options/language_options.js.rej

Patch:       chrome/browser/resources/options/language_options.js
Index: chrome/browser/resources/options/language_options.js
diff --git a/chrome/browser/resources/options/language_options.js
b/chrome/browser/resources/options/language_options.js
index
3ebf7d2665bf940e57089ced80f1c3b0ec0fc568..b3f92db0d2102ccf624d1edbe6ef938e28ec2957
100644
--- a/chrome/browser/resources/options/language_options.js
+++ b/chrome/browser/resources/options/language_options.js
@@ -426,14 +426,6 @@ cr.define('options', function() {
     },
 
     /**
-     * Happens when a user changes back to the language they're currently
using.
-     */
-    currentLocaleWasReselected: function() {
-      this.updateUiLanguageButton_(
-          loadTimeData.getString('currentUiLanguageCode'));
-    },
-
-    /**
      * Handles languageOptionsList's save event.
      * @param {Event} e Save event.
      * @private
@@ -842,7 +834,12 @@ cr.define('options', function() {
       this.savePreloadEnginesPref_();
     },
 
-    handleAddLanguageOkButtonClick_: function() {
+    /**
+     * Handles clicks on the "OK" button of the "Add language" dialog.
+     * @param {Event} e Click event.
+     * @private
+     */
+    handleAddLanguageOkButtonClick_: function(e) {
       var languagesSelect = $('add-language-overlay-language-list');
       var selectedIndex = languagesSelect.selectedIndex;
       if (selectedIndex >= 0) {
@@ -1181,6 +1178,39 @@ cr.define('options', function() {
       delayedHide();
     },
 
+    /**
+     * Chrome callback for when the UI language preference is saved.
+     * @param {string} languageCode The newly selected language to use.
+     * @private
+     */
+    uiLanguageSaved_: function(languageCode) {
+      this.prospectiveUiLanguageCode_ = languageCode;
+
+      // If the user is no longer on the same language code, ignore.
+      if ($('language-options-list').getSelectedLanguageCode() != languageCode)
+        return;
+
+      // Special case for when a user changes to a different language, and
+      // changes back to the same language without having restarted Chrome or
+      // logged in/out of ChromeOS.
+      if (languageCode == loadTimeData.getString('currentUiLanguageCode')) {
+        this.updateUiLanguageButton_(languageCode);
+        return;
+      }
+
+      // Otherwise, show a notification telling the user that their changes
will
+      // only take effect after restart.
+      showMutuallyExclusiveNodes([$('language-options-ui-language-button'),
+                                  $('language-options-ui-notification-bar')],
+                                 1);
+    },
+
+    /**
+     * A handler for when dictionary for |languageCode| begins downloading.
+     * @param {string} languageCode The language of the dictionary that just
+     *     began downloading.
+     * @private
+     */
     onDictionaryDownloadBegin_: function(languageCode) {
       this.spellcheckDictionaryDownloadStatus_[languageCode] =
           DOWNLOAD_STATUS.IN_PROGRESS;
@@ -1191,6 +1221,12 @@ cr.define('options', function() {
       }
     },
 
+    /**
+     * A handler for when dictionary for |languageCode| successfully
downloaded.
+     * @param {string} languageCode The language of the dictionary that
+     *     succeeded downloading.
+     * @private
+     */
     onDictionaryDownloadSuccess_: function(languageCode) {
       delete this.spellcheckDictionaryDownloadStatus_[languageCode];
       this.spellcheckDictionaryDownloadFailures_ = 0;
@@ -1201,6 +1237,12 @@ cr.define('options', function() {
       }
     },
 
+    /**
+     * A handler for when dictionary for |languageCode| fails to download.
+     * @param {string} languageCode The language of the dictionary that failed
+     *     to download.
+     * @private
+     */
     onDictionaryDownloadFailure_: function(languageCode) {
       this.spellcheckDictionaryDownloadStatus_[languageCode] =
           DOWNLOAD_STATUS.FAILED;
@@ -1256,29 +1298,8 @@ cr.define('options', function() {
     }
   }
 
-  /**
-   * Chrome callback for when the UI language preference is saved.
-   * @param {string} languageCode The newly selected language to use.
-   */
   LanguageOptions.uiLanguageSaved = function(languageCode) {
-    this.prospectiveUiLanguageCode_ = languageCode;
-
-    // If the user is no longer on the same language code, ignore.
-    if ($('language-options-list').getSelectedLanguageCode() != languageCode)
-      return;
-
-    // Special case for when a user changes to a different language, and
changes
-    // back to the same language without having restarted Chrome or logged
-    // in/out of ChromeOS.
-    if (languageCode == loadTimeData.getString('currentUiLanguageCode')) {
-      LanguageOptions.getInstance().currentLocaleWasReselected();
-      return;
-    }
-
-    // Otherwise, show a notification telling the user that their changes will
-    // only take effect after restart.
-    showMutuallyExclusiveNodes([$('language-options-ui-language-button'),
-                                $('language-options-ui-notification-bar')], 1);
+    LanguageOptions.getInstance().uiLanguageSaved_(languageCode);
   };
 
   LanguageOptions.onDictionaryDownloadBegin = function(languageCode) {

[Dan Beam, 2014-02-18 23:21:40]

The CQ bit was checked by dbeam@chromium.org

[commit-bot: I haz the power, 2014-02-18 23:23:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dbeam@chromium.org/168183002/190001

[commit-bot: I haz the power, 2014-02-19 02:16:12]

Change committed as 251927