summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 10:15:41 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 10:15:41 +0000
commit74b42fc17ac6a967bb9159b8270169dc63545ec0 (patch)
tree83e604062b7fdc81eee9d41ce4210ca15ab11b64 /chrome/common
parent0dbe9f329821edc0150896ca05f40a9402b259de (diff)
downloadchromium_src-74b42fc17ac6a967bb9159b8270169dc63545ec0.zip
chromium_src-74b42fc17ac6a967bb9159b8270169dc63545ec0.tar.gz
chromium_src-74b42fc17ac6a967bb9159b8270169dc63545ec0.tar.bz2
Add "settings.language.preferred_languages" for Chromium OS's Languages and Input dialog.
Before this change, we used to get the list of preferred languages based on the active input methods. This is tricky. Having a preference for the value is simpler, and makes it easier for us to implement the DOM UI version. BUG=none TEST=manually Review URL: http://codereview.chromium.org/3012012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/pref_names.cc7
-rw-r--r--chrome/common/pref_names.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index ad60dec..e04994f 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -218,8 +218,13 @@ const wchar_t kLanguageHotkeyNextEngineInMenu[] =
const wchar_t kLanguageHotkeyPreviousEngine[] =
L"settings.language.hotkey_previous_engine";
+// A string pref (comma-separated list) set to the preferred language IDs
+// (ex. "en-US,fr,ko").
+const wchar_t kLanguagePreferredLanguages[] =
+ L"settings.language.preferred_languages";
+
// A string pref (comma-separated list) set to the preloaded (active) input
-// method IDs.
+// method IDs (ex. "pinyin,mozc").
const wchar_t kLanguagePreloadEngines[] = L"settings.language.preload_engines";
// Boolean prefs for ibus-chewing Chinese input method.
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 27b0451..9897ec0 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -78,6 +78,7 @@ extern const wchar_t kLanguageCurrentInputMethod[];
extern const wchar_t kLanguagePreviousInputMethod[];
extern const wchar_t kLanguageHotkeyNextEngineInMenu[];
extern const wchar_t kLanguageHotkeyPreviousEngine[];
+extern const wchar_t kLanguagePreferredLanguages[];
extern const wchar_t kLanguagePreloadEngines[];
extern const wchar_t kLanguageChewingAutoShiftCur[];
extern const wchar_t kLanguageChewingAddPhraseDirection[];