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

Unified Diff: chrome/browser/chromeos/base/locale_util.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/base/locale_util.cc
diff --git a/chrome/browser/chromeos/base/locale_util.cc b/chrome/browser/chromeos/base/locale_util.cc
index 176a1050fc756d22b3a2d6ac0e2936e023eab79e..fa48dd61805311876883984c83f58ff5c03d9135 100644
--- a/chrome/browser/chromeos/base/locale_util.cc
+++ b/chrome/browser/chromeos/base/locale_util.cc
@@ -63,9 +63,10 @@ void FinishSwitchLanguage(scoped_ptr<SwitchLanguageData> data) {
// use may not be supported by the new locale (3rd parameter).
input_method::InputMethodManager* manager =
input_method::InputMethodManager::Get();
- manager->EnableLoginLayouts(
- data->locale,
- manager->GetInputMethodUtil()->GetHardwareLoginInputMethodId());
+ std::vector<std::string> hardware_layouts;
+ manager->GetInputMethodUtil()->GetHardwareLoginInputMethodId(
Alexander Alekseev 2014/02/11 13:36:02 nit: GetHardwareLoginInputMethodId => GetHardwareL
Seigo Nonaka 2014/02/12 13:21:02 Done.
+ &hardware_layouts);
+ manager->EnableLoginLayouts(data->locale, hardware_layouts);
if (!data->login_layouts_only) {
// Enable all the other layouts
std::vector<std::string> candidates;

Powered by Google App Engine
This is Rietveld 408576698