Make UI language change work on chromeos.

chrome/browser/resources/options2/language_options.js

 // Copyright (c) 2012 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.
 
 // TODO(kochi): Generalize the notification as a component and put it
 // in js/cr/ui/notification.js .
 
 cr.define('options', function() {
   /** @const */ var OptionsPage = options.OptionsPage;
   /** @const */ var LanguageList = options.LanguageList;
@@ skipping 22 matching lines @@
                      loadTimeData.getString('languagePageTabTitle'),
                      'languagePage');
   }
 
   cr.addSingletonGetter(LanguageOptions);
 
   // Inherit LanguageOptions from OptionsPage.
   LanguageOptions.prototype = {
     __proto__: OptionsPage.prototype,
 
+    // For recording the prospective language (the next locale after relaunch).

[Dan Beam, 2012/06/01 17:45:13]

/**
 * For recording the prospective language (the next locale after relaunch).
 * @type {?string}
 * @private
 */

+    prospectiveUiLanguageCode_: null,
+
     /**
      * Initializes LanguageOptions page.
-     * Calls base class implementation to starts preference initialization.
+     * Calls base class implementation to start preference initialization.
      */
     initializePage: function() {
       OptionsPage.prototype.initializePage.call(this);
 
       var languageOptionsList = $('language-options-list');
       LanguageList.decorate(languageOptionsList);
 
       languageOptionsList.addEventListener('change',
           this.handleLanguageOptionsListChange_.bind(this));
       languageOptionsList.addEventListener('save',
           this.handleLanguageOptionsListSave_.bind(this));
 
+      this.prospectiveUiLanguageCode_ =
+          loadTimeData.getString('prospectiveUiLanguageCode');
       this.addEventListener('visibleChange',
                             this.handleVisibleChange_.bind(this));
 
       if (cr.isChromeOS) {
         $('chewing-confirm').onclick = $('hangul-confirm').onclick =
             $('mozc-confirm').onclick = $('pinyin-confirm').onclick =
                 OptionsPage.closeOverlay.bind(OptionsPage);
 
         this.initializeInputMethodList_();
         this.initializeLanguageCodeToInputMethodIdsMap_();
@@ skipping 37 matching lines @@
 
           var spellCheckLanguageButton = getRequiredElement(
               'language-options-spell-check-language-button');
           spellCheckLanguageButton.addEventListener(
               'click',
               this.handleSpellCheckLanguageButtonClick_.bind(this));
         }
       }
 
       if (cr.isChromeOS) {
         $('language-options-ui-restart-button').onclick =

[Dan Beam, 2012/06/01 17:45:13]

you don't need to wrap this

[kochi, 2012/06/02 22:39:14]

Done.

-            chrome.send.bind(chrome, 'uiLanguageRestart');

[Evan Stade, 2012/06/01 17:21:17]

is this change necessary/related? I don't really care one way or another, just
wondering.

[kochi, 2012/06/02 22:39:14]

This line caused a NOTREACHED(). - so this also fixes the crash on changing
UI language.

+            function(e) {
+              chrome.send('uiLanguageRestart');
+            };
       }
 
       $('language-confirm').onclick =
           OptionsPage.closeOverlay.bind(OptionsPage);
     },
 
     // The preference is a boolean that enables/disables spell checking.
     enableSpellCheckPref: 'browser.enable_spellchecking',
     // The preference is a CSV string that describes preload engines
     // (i.e. active input methods).
@@ skipping 236 matching lines @@
       var uiLanguageMessage = $('language-options-ui-language-message');
       var uiLanguageNotification = $('language-options-ui-notification-bar');
 
       // Remove the event listener and add it back if useful.
       uiLanguageButton.onclick = null;
 
       // Unhide the language button every time, as it could've been previously
       // hidden by a language change.
       uiLanguageButton.hidden = false;
 
-      if (languageCode == loadTimeData.getString('prospectiveUiLanguageCode')) {
+      if (languageCode == this.prospectiveUiLanguageCode_) {
         uiLanguageMessage.textContent =
             loadTimeData.getString('is_displayed_in_this_language');
         showMutuallyExclusiveNodes(
             [uiLanguageButton, uiLanguageMessage, uiLanguageNotification], 1);
       } else if (languageCode in loadTimeData.getValue('uiLanguageCodeSet')) {
         if (cr.isChromeOS && UIAccountTweaks.loggedInAsGuest()) {
           // In the guest mode for ChromeOS, changing UI language does not make
           // sense because it does not take effect after browser restart.
           uiLanguageButton.hidden = true;
           uiLanguageMessage.hidden = true;
@@ skipping 189 matching lines @@
         OptionsPage.closeOverlay();
       }
     },
 
     /**
      * Checks if languageCode is deletable or not.
      * @param {String} languageCode the languageCode to check for deletability.
      */
     languageIsDeletable: function(languageCode) {
       // Don't allow removing the language if it's a UI language.
-      if (languageCode == loadTimeData.getString('prospectiveUiLanguageCode'))
+      if (languageCode == this.prospectiveUiLanguageCode_)
         return false;
       return (!cr.isChromeOS ||
               this.canDeleteLanguage_(languageCode));
     },
 
     /**
      * Handles browse.enable_spellchecking change.
      * @param {Event} e Change event.
      * @private
      */
@@ skipping 223 matching lines @@
       assert(nodes[i] instanceof HTMLElement);  // TODO(dbeam): Ignore null?
       nodes[i].hidden = i != index;
     }
   }
 
   /**
    * Chrome callback for when the UI language preference is saved.
    * @param {string} languageCode The newly selected language to use.
    */
   LanguageOptions.uiLanguageSaved = function(languageCode) {
-    loadTimeData.getString('prospectiveUiLanguageCode') = 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);
   };
 
   // Export
   return {
     LanguageOptions: LanguageOptions
   };
 });