Support comma separated hardware keyboard layout.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index d1f76ce88417c1175de246f15e5ba50e0997af21..360dbb440c4303eba2c9630f826e15d6d53e16bb 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -580,10 +580,12 @@ void GuestLanguageSetCallbackData::Callback(
       input_method::InputMethodManager::Get();
   // Active layout must be hardware "login layout".
   // The previous one must be "locale default layout".
-  const std::string login_input_method =
-      ime_manager->GetInputMethodUtil()->GetHardwareLoginInputMethodId();
-  ime_manager->ChangeInputMethod(login_input_method);
+  // First, enable all hardware input methods.
+  const std::vector<std::string>& input_methods =
+      ime_manager->GetInputMethodUtil()->GetHardwareInputMethodIds();
+  ime_manager->EnableInputMethods(input_methods);
 
+  // Second, enable locale based input methods.
   const std::string locale_default_input_method =
       ime_manager->GetInputMethodUtil()->
           GetLanguageDefaultInputMethodId(loaded_locale);
@@ -591,7 +593,13 @@ void GuestLanguageSetCallbackData::Callback(
     PrefService* user_prefs = self->profile->GetPrefs();
     user_prefs->SetString(prefs::kLanguagePreviousInputMethod,
                           locale_default_input_method);
+    ime_manager->EnableInputMethod(locale_default_input_method);
   }
+
+  // Finally, activate the first login input method.
+  const std::vector<std::string>& login_input_methods =
+      ime_manager->GetInputMethodUtil()->GetHardwareLoginInputMethodIds();
+  ime_manager->ChangeInputMethod(login_input_methods[0]);
 }
 
 void SetGuestLocale(UserManager* const usermanager, Profile* const profile) {