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..2e4aff940818577eac8fdfa8744fedf4f08f4544 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -580,9 +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); |
+ const std::vector<std::string>& input_methods = |
+ ime_manager->GetInputMethodUtil()->GetHardwareInputMethodIds(); |
+ for (size_t i = 0; i < input_methods.size(); ++i) |
+ ime_manager->EnableInputMethod(input_methods[i]); |
+ ime_manager->ChangeInputMethod( |
+ input_methods.empty() ? "" : input_methods[0]); |
const std::string locale_default_input_method = |
ime_manager->GetInputMethodUtil()-> |