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..7c5a9e8afd8e68eca69a85c2bea9f71fc4892aff 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); |
+ std::vector<std::string> input_methods = |
Alexander Alekseev
2014/02/12 14:45:35
const vector<string>&
Seigo Nonaka
2014/02/12 16:49:51
Done.
|
+ 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]); |
Alexander Alekseev
2014/02/12 14:45:35
You select first hardware input method which might
Seigo Nonaka
2014/02/12 16:49:51
If my understanding is correct, this function is c
Alexander Alekseev
2014/02/12 17:55:52
Yes, this is called after guest session is started
Seigo Nonaka
2014/02/13 04:36:05
Sure, done.
On 2014/02/12 17:55:52, alemate wrote
|
const std::string locale_default_input_method = |
ime_manager->GetInputMethodUtil()-> |