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

Unified Diff: chrome/browser/chromeos/language_preferences.h

Issue 3038025: Implement the "Configure modifier keys" drop-down (Closed)
Patch Set: review fix Created 10 years, 5 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/language_preferences_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/language_preferences.h
diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h
index 34ab1ec5998b51fa3e18a4b7d37a34ac44f2d800..2b60d3824e54b4e2257a2ff91aaa12a8f620f2f6 100644
--- a/chrome/browser/chromeos/language_preferences.h
+++ b/chrome/browser/chromeos/language_preferences.h
@@ -93,6 +93,25 @@ const LanguageIntegerRangePreference kChewingIntegerPrefs[] = {
};
const size_t kNumChewingIntegerPrefs = ARRAYSIZE_UNSAFE(kChewingIntegerPrefs);
+// Temporary solution for crosbug.com/2636. We'll implement a complete dialog
+// using DOMUI later.
+enum RemapType {
+ kNoRemap = 0,
+ kSwapCtrlAndAlt = 1,
+ kSwapSearchAndCtrl = 2,
+};
+const LanguageMultipleChoicePreference<int> kXkbModifierMultipleChoicePrefs = {
+ prefs::kLanguageXkbModifierRemap,
+ kNoRemap,
+ "dummy", // does not use the ibus configuration service.
+ {{ kNoRemap, IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_MODIFIER_NO_REMAP },
+ { kSwapCtrlAndAlt,
+ IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_MODIFIER_REMAP_CTRL_ALT },
+ { kSwapSearchAndCtrl,
+ IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_MODIFIER_REMAP_SEARCH_CTRL }},
+ 0, // does not use the label.
+};
+
const LanguageMultipleChoicePreference<const char*>
kChewingMultipleChoicePrefs[] = {
{ prefs::kLanguageChewingKeyboardType,
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/language_preferences_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698