ChromeOS: GetKeyboardLayoutsForResolvedLocale() should default to requested locale.

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 <stddef.h>
 
 #include <iterator>
 #include <map>
@@ skipping 264 matching lines @@
     }
 
     const LanguagePair& pair = language_map[out_display_names[i]];
     language_list->Append(
         CreateLanguageEntry(pair.first, out_display_names[i], pair.second));
   }
 
   return language_list;
 }
 
+// Note: this method updates |selected_locale| only if it is empty.
+void GetAndMergeKeyboardLayoutsForLocale(input_method::InputMethodUtil* util,
+                                         const std::string& locale,
+                                         std::string* selected_locale,
+                                         std::vector<std::string>* layouts) {

[Shu Chen, 2016/06/29 13:10:37]

Please remove potential duplicates in |layouts|.

[Alexander Alekseev, 2016/06/29 23:00:46]

Duplicates are removed on lines 318-327 below. We have
    std::set<std::string> input_methods_added;
specially for this.

+  std::vector<std::string> layouts_from_locale;
+  util->GetInputMethodIdsFromLanguageCode(
+      locale, input_method::kKeyboardLayoutsOnly, &layouts_from_locale);
+  layouts->insert(layouts->end(), layouts_from_locale.begin(),
+                  layouts_from_locale.end());
+  if (selected_locale->empty() && !layouts_from_locale.empty()) {
+    *selected_locale =
+        util->GetInputMethodDescriptorFromId(layouts_from_locale[0])->id();
+  }
+}
+
 // Invokes |callback| with a list of keyboard layouts that can be used for
 // |resolved_locale|.
 void GetKeyboardLayoutsForResolvedLocale(
+    const std::string& requested_locale,
     const GetKeyboardLayoutsForLocaleCallback& callback,
     const std::string& resolved_locale) {
   input_method::InputMethodUtil* util =
       input_method::InputMethodManager::Get()->GetInputMethodUtil();
   std::vector<std::string> layouts = util->GetHardwareInputMethodIds();
-  std::vector<std::string> layouts_from_locale;
-  util->GetInputMethodIdsFromLanguageCode(
-      resolved_locale,
-      input_method::kKeyboardLayoutsOnly,
-      &layouts_from_locale);
-  layouts.insert(layouts.end(), layouts_from_locale.begin(),
-                 layouts_from_locale.end());
 
+  // "Selected" will be set from the fist non-empty list.
   std::string selected;

[Shu Chen, 2016/06/29 13:10:37]

|selected| is unused?

[Alexander Alekseev, 2016/06/29 23:00:46]

See line 327 below.

-  if (!layouts_from_locale.empty()) {
-    selected =
-        util->GetInputMethodDescriptorFromId(layouts_from_locale[0])->id();
-  }
+  GetAndMergeKeyboardLayoutsForLocale(util, requested_locale, &selected,
+                                      &layouts);
+  GetAndMergeKeyboardLayoutsForLocale(util, resolved_locale, &selected,
+                                      &layouts);
 
   std::unique_ptr<base::ListValue> input_methods_list(new base::ListValue);
   std::set<std::string> input_methods_added;
   for (std::vector<std::string>::const_iterator it = layouts.begin();
        it != layouts.end(); ++it) {
     const input_method::InputMethodDescriptor* ime =
         util->GetInputMethodDescriptorFromId(*it);
     if (!InsertString(ime->id(), &input_methods_added))
       continue;
     input_methods_list->Append(
@@ skipping 256 matching lines @@
   scoped_refptr<base::SequencedTaskRunner> background_task_runner =
       worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
           worker_pool->GetNamedSequenceToken(kSequenceToken),
           base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
 
   // Resolve |locale| on a background thread, then continue on the current
   // thread.
   std::string (*get_application_locale)(const std::string&, bool) =
       &l10n_util::GetApplicationLocale;
   base::PostTaskAndReplyWithResult(
-      background_task_runner.get(),
-      FROM_HERE,
+      background_task_runner.get(), FROM_HERE,
       base::Bind(get_application_locale, locale, false /* set_icu_locale */),
-      base::Bind(&GetKeyboardLayoutsForResolvedLocale, callback));
+      base::Bind(&GetKeyboardLayoutsForResolvedLocale, locale, callback));
 }
 
 std::unique_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