Build the language list just like we do in the C++ version.

chrome/browser/chromeos/dom_ui/language_options_handler.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/chromeos/dom_ui/language_options_handler.h"
 
 #include <map>
 #include <string>
 #include <utility>
 
@@ skipping 38 matching lines @@
       l10n_util::GetStringF(
           IDS_OPTIONS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE,
           l10n_util::GetString(IDS_PRODUCT_OS_NAME)));
   localized_strings->SetString(L"display_in_this_language",
       l10n_util::GetStringF(
           IDS_OPTIONS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE,
           l10n_util::GetString(IDS_PRODUCT_OS_NAME)));
   localized_strings->SetString(L"restart_required",
       l10n_util::GetString(IDS_OPTIONS_RESTART_REQUIRED));
 
+  // GetSupportedInputMethods() never return NULL.
+  scoped_ptr<InputMethodDescriptors> descriptors(
+      CrosLibrary::Get()->GetInputMethodLibrary()->GetSupportedInputMethods());
+
   // The followigns are resources, rather than local strings.
   localized_strings->SetString(L"currentUiLanguageCode",
       UTF8ToWide(g_browser_process->GetApplicationLocale()));
-  localized_strings->Set(L"inputMethodList", GetInputMethodList());
-  localized_strings->Set(L"languageList", GetLanguageList());
+  localized_strings->Set(L"inputMethodList", GetInputMethodList(*descriptors));
+  localized_strings->Set(L"languageList", GetLanguageList(*descriptors));
 }
 
 void LanguageOptionsHandler::RegisterMessages() {
   DCHECK(dom_ui_);
   dom_ui_->RegisterMessageCallback("uiLanguageChange",
       NewCallback(this,
                   &LanguageOptionsHandler::UiLanguageChangeCallback));
 }
 
-ListValue* LanguageOptionsHandler::GetInputMethodList() {
+ListValue* LanguageOptionsHandler::GetInputMethodList(
+    const InputMethodDescriptors& descriptors) {
   ListValue* input_method_list = new ListValue();
 
-  // GetSupportedLanguages() never return NULL.
-  scoped_ptr<InputMethodDescriptors> descriptors(
-      CrosLibrary::Get()->GetInputMethodLibrary()->GetSupportedInputMethods());
-  for (size_t i = 0; i < descriptors->size(); ++i) {
-    const InputMethodDescriptor& descriptor = descriptors->at(i);
+  for (size_t i = 0; i < descriptors.size(); ++i) {
+    const InputMethodDescriptor& descriptor = descriptors[i];
     const std::string language_code =
         input_method::GetLanguageCodeFromDescriptor(descriptor);
     const std::string display_name =
         input_method::GetInputMethodDisplayNameFromId(descriptor.id);
 
     DictionaryValue* dictionary = new DictionaryValue();
     dictionary->SetString(L"id", UTF8ToWide(descriptor.id));
     dictionary->SetString(L"displayName", UTF8ToWide(display_name));
     dictionary->SetString(L"languageCode", UTF8ToWide(language_code));
     input_method_list->Append(dictionary);
   }
 
   return input_method_list;
 }
 
-ListValue* LanguageOptionsHandler::GetLanguageList() {
+ListValue* LanguageOptionsHandler::GetLanguageList(
+    const InputMethodDescriptors& descriptors) {
+  std::vector<std::string> language_codes;
+  // Collect the language codes from the supported input methods.
+  for (size_t i = 0; i < descriptors.size(); ++i) {
+    const InputMethodDescriptor& descriptor = descriptors[i];
+    const std::string language_code =
+        input_method::GetLanguageCodeFromDescriptor(descriptor);
+    language_codes.push_back(language_code);
+  }
+  // Collect the language codes from kExtraLanguages.
+  for (size_t i = 0; i < arraysize(input_method::kExtraLanguages); ++i) {
+    const char* language_code =
+        input_method::kExtraLanguages[i].language_code;
+    language_codes.push_back(language_code);
+  }
+
   // Map of display name -> {language code, native_display_name}.
   // In theory, we should be able to create a map that is sorted by
   // display names using ICU comparator, but doing it is hard, thus we'll
   // use an auxiliary vector to achieve the same result.
   typedef std::pair<std::string, std::wstring> LanguagePair;
   typedef std::map<std::wstring, LanguagePair> LanguageMap;
   LanguageMap language_map;
   // The auxiliary vector mentioned above.
   std::vector<std::wstring> display_names;
 
   // Build the list of display names, and build the language map.
-  const std::vector<std::string>& locales = l10n_util::GetAvailableLocales();
-  for (size_t i = 0; i < locales.size(); ++i) {
+  for (size_t i = 0; i < language_codes.size(); ++i) {
     const std::wstring display_name =
-        input_method::GetLanguageDisplayNameFromCode(locales[i]);
+        input_method::GetLanguageDisplayNameFromCode(language_codes[i]);
     const std::wstring native_display_name =
         input_method::GetLanguageNativeDisplayNameFromCode(
-            locales[i]);
+            language_codes[i]);
     display_names.push_back(display_name);
     language_map[display_name] =
-        std::make_pair(locales[i], native_display_name);
+        std::make_pair(language_codes[i], native_display_name);
   }
   DCHECK_EQ(display_names.size(), language_map.size());
 
   // Sort display names using locale specific sorter.
   l10n_util::SortStrings(g_browser_process->GetApplicationLocale(),
                          &display_names);
 
   // Build the language list from the language map.
   ListValue* language_list = new ListValue();
   for (size_t i = 0; i < display_names.size(); ++i) {
@@ skipping 24 matching lines @@
     return;
   }
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetString(prefs::kApplicationLocale, language_code);
   prefs->SavePersistentPrefs();
   dom_ui_->CallJavascriptFunction(
       L"options.LanguageOptions.uiLanguageSaved");
 }
 
 }  // namespace chromeos