Support comma separated hardware keyboard layout.

chrome/browser/chromeos/base/locale_util.cc

 // Copyright 2013 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/base/locale_util.h"
 
 #include <vector>
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
@@ skipping 45 matching lines @@
   if (data->success) {
     g_browser_process->SetApplicationLocale(data->loaded_locale);
 
     if (data->enableLocaleKeyboardLayouts) {
       // If we have switched the locale, enable the keyboard layouts that
       // are necessary for the new locale.  Change the current input method
       // to the hardware keyboard layout since the input method currently in
       // use may not be supported by the new locale (3rd parameter).
       input_method::InputMethodManager* manager =
           input_method::InputMethodManager::Get();
-      manager->EnableLoginLayouts(
-          data->locale,
-          manager->GetInputMethodUtil()->GetHardwareLoginInputMethodId());
+      std::vector<std::string> hardware_layouts;
+      manager->GetInputMethodUtil()->GetHardwareLoginInputMethodId(

[Alexander Alekseev, 2014/02/11 13:36:02]

nit: GetHardwareLoginInputMethodId => GetHardwareLoginInputMethodIds

[Seigo Nonaka, 2014/02/12 13:21:02]

Done.

+          &hardware_layouts);
+      manager->EnableLoginLayouts(data->locale, hardware_layouts);
       if (!data->login_layouts_only) {
         // Enable all the other layouts
         std::vector<std::string> candidates;
         input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
         // Add input methods associated with the language.
         util->GetInputMethodIdsFromLanguageCode(
             data->locale, input_method::kKeyboardLayoutsOnly, &candidates);
         for (std::vector<std::string>::const_iterator i = candidates.begin();
              i != candidates.end();
              ++i)
@@ skipping 23 matching lines @@
   base::Closure reloader(
       base::Bind(&SwitchLanguageDoReloadLocale, base::Unretained(data.get())));
   content::BrowserThread::PostBlockingPoolTaskAndReply(
       FROM_HERE,
       reloader,
       base::Bind(&FinishSwitchLanguage, base::Passed(data.Pass())));
 }
 
 }  // namespace locale_util
 }  // namespace chromeos