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

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: Fix compile failure 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..3130cbcfa7282b88ac0e0ce4e344ca02ecf9bdf8 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -580,9 +580,11 @@ void GuestLanguageSetCallbackData::Callback(
input_method::InputMethodManager::Get();
Alexander Alekseev 2014/02/11 13:36:02 Need to enable here all the other (non-login) hard
Seigo Nonaka 2014/02/12 13:21:02 Done.
// 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> login_input_methods;
+ ime_manager->GetInputMethodUtil()->GetHardwareLoginInputMethodId(
+ &login_input_methods);
+ ime_manager->ChangeInputMethod(
+ login_input_methods.empty() ? "" : login_input_methods[0]);
const std::string locale_default_input_method =
ime_manager->GetInputMethodUtil()->

Powered by Google App Engine
This is Rietveld 408576698