summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/preferences.h
diff options
context:
space:
mode:
authoryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-12 10:40:04 +0000
committeryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-12 10:40:04 +0000
commitb5194dd3757457eb2cd6760b844a0a2660e233f0 (patch)
treea10911493769f776b65dfb86a4282f680cfee871 /chrome/browser/chromeos/preferences.h
parenta15236494feb1f18676d53d121b0c5499ce92c3d (diff)
downloadchromium_src-b5194dd3757457eb2cd6760b844a0a2660e233f0.zip
chromium_src-b5194dd3757457eb2cd6760b844a0a2660e233f0.tar.gz
chromium_src-b5194dd3757457eb2cd6760b844a0a2660e233f0.tar.bz2
Add prefs for the DOMUI version of "Customize modifier keys" dialog.
Mazda: In your DOMUI html, please set the integers defined in chromeos_keyboard.h: enum ModifierKey { kSearchKey = 0, kLeftControlKey, kLeftAltKey, kVoidKey, kCapsLockKey, kNumModifierKeys, }; to the following integer prefs: prefs::kLanguageXkbRemapSearchKeyTo prefs::kLanguageXkbRemapControlKeyTo prefs::kLanguageXkbRemapAltKeyTo BUG=chromium-os:5152 TEST=manually Review URL: http://codereview.chromium.org/3141011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/preferences.h')
-rw-r--r--chrome/browser/chromeos/preferences.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index 9dd86e1..18f137d 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -75,6 +75,9 @@ class Preferences : public NotificationObserver {
const char* name,
const std::string& value);
+ // Updates the mapping of modifier keys following current prefs values.
+ void UpdateModifierKeyMapping();
+
// Updates the initial key repeat delay and key repeat interval following
// current prefs values. We set the delay and interval at once since an
// underlying XKB API requires it.
@@ -105,7 +108,9 @@ class Preferences : public NotificationObserver {
StringPrefMember language_mozc_multiple_choice_prefs_[
kNumMozcMultipleChoicePrefs];
IntegerPrefMember language_mozc_integer_prefs_[kNumMozcIntegerPrefs];
- IntegerPrefMember language_xkb_modifier_remap_;
+ IntegerPrefMember language_xkb_remap_search_key_to_;
+ IntegerPrefMember language_xkb_remap_control_key_to_;
+ IntegerPrefMember language_xkb_remap_alt_key_to_;
BooleanPrefMember language_xkb_auto_repeat_enabled_;
IntegerPrefMember language_xkb_auto_repeat_delay_pref_;
IntegerPrefMember language_xkb_auto_repeat_interval_pref_;