summaryrefslogtreecommitdiffstats
path: root/chrome/common/pref_names.cc
diff options
context:
space:
mode:
authorsuzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 06:05:05 +0000
committersuzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 06:05:05 +0000
commit3b02de2903ca82833712f6ab7840a4e16524c70b (patch)
treeb409c0ba1aa920df72dee8e79648b1244393c931 /chrome/common/pref_names.cc
parentb4f68deaa9a3a32dee86429b6f54f541d89edcef (diff)
downloadchromium_src-3b02de2903ca82833712f6ab7840a4e16524c70b.zip
chromium_src-3b02de2903ca82833712f6ab7840a4e16524c70b.tar.gz
chromium_src-3b02de2903ca82833712f6ab7840a4e16524c70b.tar.bz2
Refine language preferences.
This CL removes the code related to following unconfigurable ibus configs: general/use_global_engine general/hotkey/trigger Their default values will be correctly initialized in ibus. Also renames following configs: next_engine renames to next_engine_in_menu prev_engine renames to previous_engine git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/pref_names.cc')
-rw-r--r--chrome/common/pref_names.cc20
1 files changed, 9 insertions, 11 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 4a3579c..4d73e6a 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -198,17 +198,15 @@ const wchar_t kTouchpadSpeedFactor[] = L"settings.touchpad.speed_factor";
// A integer pref for the touchpad sensitivity.
const wchar_t kTouchpadSensitivity[] = L"settings.touchpad.sensitivity";
-// Boolean that is true when one input method status can be shared by all input
-// contexts in all Chrome processes.
-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_v2";
-
-// 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 "next engine in menu"
+// hot-key lists.
+const wchar_t kLanguageHotkeyNextEngineInMenu[] =
+ L"settings.language.hotkey_next_engine_in_menu";
+
+// A string pref (comma-separated list) set to the "previous engine"
+// hot-key lists.
+const wchar_t kLanguageHotkeyPreviousEngine[] =
+ L"settings.language.hotkey_previous_engine";
// A string pref (comma-separated list) set to the preloaded (active) input
// method IDs.