Add UX for languages that don't have any associated input method

chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 56 matching lines @@
           IDS_OPTIONS_SETTINGS_LANGUAGES_SELECT_PREVIOUS_INPUT_METHOD_HINT));
   localized_strings->SetString("restart_button",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_SIGN_OUT_BUTTON));
   localized_strings->SetString("extension_ime_label",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD_EXTENSION_IME));
   localized_strings->SetString("extension_ime_description",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD_EXTENSION_DESCRIPTION));
+  localized_strings->SetString("noInputMethods",
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_NO_INPUT_METHODS));
 
   input_method::InputMethodManager* manager =
       input_method::GetInputMethodManager();
   // GetSupportedInputMethods() never return NULL.
   scoped_ptr<input_method::InputMethodDescriptors> descriptors(
       manager->GetSupportedInputMethods());
   localized_strings->Set("languageList", GetLanguageList(*descriptors));
   localized_strings->Set("inputMethodList", GetInputMethodList(*descriptors));
   localized_strings->Set("extensionImeList", GetExtensionImeList());
 }
@@ skipping 47 matching lines @@
     dictionary->Set("languageCodeSet", language_codes);
 
     input_method_list->Append(dictionary);
   }
 
   return input_method_list;
 }
 
 ListValue* CrosLanguageOptionsHandler::GetLanguageList(
     const input_method::InputMethodDescriptors& descriptors) {
+  const std::string app_locale = g_browser_process->GetApplicationLocale();
+
   std::set<std::string> language_codes;
   // Collect the language codes from the supported input methods.
   for (size_t i = 0; i < descriptors.size(); ++i) {
     const input_method::InputMethodDescriptor& descriptor = descriptors[i];
     const std::string language_code = descriptor.language_code();
     language_codes.insert(language_code);
   }
   // Collect the language codes from extra languages.
   const std::vector<std::string> extra_language_codes =
       input_method::GetInputMethodManager()->GetInputMethodUtil()
@@ skipping 20 matching lines @@
         input_method_util->GetLanguageDisplayNameFromCode(*iter);
     const string16 native_display_name =
         input_method::InputMethodUtil::GetLanguageNativeDisplayNameFromCode(
             *iter);
     display_names.push_back(display_name);
     language_map[display_name] =
         std::make_pair(*iter, native_display_name);
   }
   DCHECK_EQ(display_names.size(), language_map.size());
 
+  // Collect the language codes from the supported accept-languages.
+  std::vector<std::string> accept_language_codes;
+  l10n_util::GetAcceptLanguagesForLocale(app_locale, &accept_language_codes);
+
+  // Build the list of display names, and build the language map.
+  for (size_t i = 0; i < accept_language_codes.size(); ++i) {
+    // Skip this language if it was already added.
+    if (language_codes.find(accept_language_codes[i]) != language_codes.end())
+      continue;
+    string16 display_name =
+        l10n_util::GetDisplayNameForLocale(
+            accept_language_codes[i], app_locale, false);
+    string16 native_display_name =
+        l10n_util::GetDisplayNameForLocale(
+            accept_language_codes[i], accept_language_codes[i], false);
+    display_names.push_back(display_name);
+    language_map[display_name] =
+        std::make_pair(accept_language_codes[i], native_display_name);
+  }
+
   // Sort display names using locale specific sorter.
-  l10n_util::SortStrings16(g_browser_process->GetApplicationLocale(),
-                           &display_names);
+  l10n_util::SortStrings16(app_locale, &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) {
     // Sets the directionality of the display language name.
     string16 display_name(display_names[i]);
     bool markup_removal =
         base::i18n::UnadjustStringForLocaleDirection(&display_name);
     DCHECK(markup_removal);
     bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(display_name);
@@ skipping 65 matching lines @@
 void CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback(
     const ListValue* args) {
   const std::string input_method_id = UTF16ToASCII(ExtractStringValue(args));
   const std::string action = base::StringPrintf(
       "InputMethodOptions_Open_%s", input_method_id.c_str());
   content::RecordComputedAction(action);
 }
 
 }  // namespace options
 }  // namespace chromeos