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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/preferences.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
« chrome/browser/chromeos/login/login_display_host_impl.cc ('K') | « chrome/browser/chromeos/login/login_display_host_impl.cc ('k') | chromeos/ime/fake_input_method_delegate.h » ('j') | chromeos/ime/input_method_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/preferences.cc
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index d25473dc5b53b82c45e00ea12c1eb0595ae07678..3461607b53fad1d9fdcb72897188527582e171cb 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -92,8 +92,10 @@ void Preferences::RegisterProfilePrefs(
input_method::InputMethodManager* manager =
input_method::InputMethodManager::Get();
if (manager) {
- hardware_keyboard_id =
- manager->GetInputMethodUtil()->GetHardwareInputMethodId();
+ std::vector<std::string> hardware_layouts;
Alexander Alekseev 2014/02/11 13:36:02 #include <vector>
Seigo Nonaka 2014/02/12 13:21:02 Done.
+ manager->GetInputMethodUtil()->GetHardwareInputMethodIds(
+ &hardware_layouts);
+ hardware_keyboard_id = JoinString(hardware_layouts, ',');
}
} else {
hardware_keyboard_id = "xkb:us::eng"; // only for testing.
« chrome/browser/chromeos/login/login_display_host_impl.cc ('K') | « chrome/browser/chromeos/login/login_display_host_impl.cc ('k') | chromeos/ime/fake_input_method_delegate.h » ('j') | chromeos/ime/input_method_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698