diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 10:35:55 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 10:35:55 +0000 |
| commit | 2c25ddfdc8fd5180c75c66d700d94f8dac71238f (patch) | |
| tree | 4833e64eb63d1a7502428b445c290d39f0527de3 /chrome/common/pref_names.cc | |
| parent | 8b0cd39c1238c960ee8003755d89b7431eb8ae2a (diff) | |
| download | chromium_src-2c25ddfdc8fd5180c75c66d700d94f8dac71238f.zip chromium_src-2c25ddfdc8fd5180c75c66d700d94f8dac71238f.tar.gz chromium_src-2c25ddfdc8fd5180c75c66d700d94f8dac71238f.tar.bz2 | |
Adding 2 preferences for configuring "NextEngine" and "Trigger" hot-keys.
This change also disables the latter hot-key so that users can't disable IBus. This is preferable since "current input method is xkb:us::eng (for example) and it is enabled" and "current one is xkb:us::eng but it's disabled" are almost indistinguishable.
This change depends on http://codereview.chromium.org/1528023 and http://codereview.chromium.org/1610013.
BUG=none
TEST=boot chrome os, activate English and Chinese, click omnibox, press lang menu, press English to enable "xkb:us::eng", press omnibox, press ctrl+space, verify that the menu shows "Chi" (not "Eng").
Review URL: http://codereview.chromium.org/1553018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/pref_names.cc')
| -rw-r--r-- | chrome/common/pref_names.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index 2833173..5f8cd2d 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -199,6 +199,13 @@ const wchar_t kTouchpadSensitivity[] = L"settings.touchpad.sensitivity"; const wchar_t kLanguageUseGlobalEngine[] = L"settings.language.use_global_engine"; +// A string pref (comma-separated list) set to the "next engine" hot-key lists. +const wchar_t kLanguageHotkeyNextEngine[] = + L"settings.language.hotkey_next_engine"; + +// A string pref (comma-separated list) set to the "trigger" hot-key lists. +const wchar_t kLanguageHotkeyTrigger[] = L"settings.language.hotkey_trigger"; + // A string pref (comma-separated list) set to the preloaded (active) IME IDs. const wchar_t kLanguagePreloadEngines[] = L"settings.language.preload_engines"; |