Support comma separated hardware keyboard layout.

chrome/browser/chromeos/login/login_display_host_impl.cc

Index: chrome/browser/chromeos/login/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc
index 5e1d4b97817f09c77ad047a47f3ebb5890ce3b02..73c112f287d81726e0ac00438e13b94b16905f61 100644
--- a/chrome/browser/chromeos/login/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/login_display_host_impl.cc
@@ -124,6 +124,7 @@ const int64 kPolicyServiceInitializationDelayMilliseconds = 100;
 // The information will be used in InputMethodUtil::GetHardwareInputMethodId().
 void DetermineAndSaveHardwareKeyboard(const std::string& locale,
                                       const std::string& oem_layout) {
+  LOG(ERROR) << oem_layout;

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

Remove debug ?

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

Oops, I'm sorry.
Removed.

On 2014/02/11 13:36:02, alemate wrote:

   std::string layout;
   if (!oem_layout.empty()) {
     // If the OEM layout information is provided, use it.
@@ -1139,8 +1140,10 @@ void ShowLoginWizard(const std::string& first_screen_name) {
     if (!prefs->HasPrefPath(prefs::kApplicationLocale)) {
       std::string locale = chromeos::StartupUtils::GetInitialLocale();
       prefs->SetString(prefs::kApplicationLocale, locale);
-      manager->EnableLoginLayouts(
-          locale, manager->GetInputMethodUtil()->GetHardwareInputMethodId());
+      std::vector<std::string> hardware_layouts;
+      manager->GetInputMethodUtil()->GetHardwareInputMethodIds(
+          &hardware_layouts);
+      manager->EnableLoginLayouts(locale, hardware_layouts);
       base::ThreadRestrictions::ScopedAllowIO allow_io;
       const std::string loaded_locale =
           ResourceBundle::GetSharedInstance().ReloadLocaleResources(locale);