GetUILanguageList should correctly handle locale aliases.

chrome/browser/ui/webui/chromeos/login/l10n_util.cc

 // Copyright 2014 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/chromeos/login/l10n_util.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 149 matching lines @@
   }
 
   // Translate language codes, generated from input methods.
   for (std::set<std::string>::const_iterator it = language_codes.begin();
        it != language_codes.end(); ++it) {
      // Exclude the language which is not in |base_langauge_codes| even it has
      // input methods.
     if (std::find(base_language_codes.begin(),
                   base_language_codes.end(),
                   *it) == base_language_codes.end()) {
-      continue;
+      // Try to translate language code and look up again.
+      std::string resolved_locale;
+
+      if (!l10n_util::CheckAndResolveLocale(*it, &resolved_locale))
+        continue;
+
+      if (std::find(base_language_codes.begin(),
+                    base_language_codes.end(),
+                    resolved_locale) == base_language_codes.end()) {
+        continue;
+      }
+      // Translated language was successfully found.
     }
 
     const base::string16 display_name =
         l10n_util::GetDisplayNameForLocale(*it, app_locale, true);
     const base::string16 native_display_name =
         l10n_util::GetDisplayNameForLocale(*it, *it, true);
 
     language_map[display_name] =
         std::make_pair(*it, native_display_name);
 
@@ skipping 311 matching lines @@
 scoped_ptr<base::DictionaryValue> GetCurrentKeyboardLayout() {
   const input_method::InputMethodDescriptor current_input_method =
       input_method::InputMethodManager::Get()
           ->GetActiveIMEState()
           ->GetCurrentInputMethod();
   return CreateInputMethodsEntry(current_input_method,
                                  current_input_method.id());
 }
 
 }  // namespace chromeos