Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4863)

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 139803010: Support comma separated hardware keyboard layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing comments Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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()->

Powered by Google App Engine
This is Rietveld 408576698