summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/language_preferences.cc
diff options
context:
space:
mode:
authoryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 05:11:16 +0000
committeryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 05:11:16 +0000
commit738446c95d57e638f26bf2124fceabe31f44ff98 (patch)
tree48ae7c48864d0f1732a8116320e8ff72d135a2f3 /chrome/browser/chromeos/language_preferences.cc
parent2f0c845225449af395044799c425336f2bb31567 (diff)
downloadchromium_src-738446c95d57e638f26bf2124fceabe31f44ff98.zip
chromium_src-738446c95d57e638f26bf2124fceabe31f44ff98.tar.gz
chromium_src-738446c95d57e638f26bf2124fceabe31f44ff98.tar.bz2
Improve Korean keyboard support.
- Add resources for xkb:kr:kr104:kor. - Add "Hangul" to kHotkeyNextEngineInMenu. The key works just like the Zenkaku_Hankaku key on a Japanese keyboard. - Change Hangul-to-Hanja hotkey from "Ctrl+Alt+9" to "Ctrl+9" following Mozc's policy. Note that we can use Hangul_Hanja key for the purpose as well. BUG=chromium-os:4812 TEST=manually checked that both Hangul and Hangul_Hanja keys are working as intended. see the bug for details. Review URL: http://codereview.chromium.org/3323012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/language_preferences.cc')
-rw-r--r--chrome/browser/chromeos/language_preferences.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/language_preferences.cc b/chrome/browser/chromeos/language_preferences.cc
index 0379361..2617787 100644
--- a/chrome/browser/chromeos/language_preferences.cc
+++ b/chrome/browser/chromeos/language_preferences.cc
@@ -18,13 +18,10 @@ const char kHotKeySectionName[] = "general/hotkey";
const char kPreloadEnginesConfigName[] = "preload_engines";
const char kNextEngineInMenuConfigName[] = "next_engine_in_menu";
const char kPreviousEngineConfigName[] = "previous_engine";
-// TODO(yusukes): Check if the "Kana/Eisu" key in the Japanese keyboard for
-// Chrome OS actually generates Zenkaku_Hankaku when the keyboard gets ready.
// ibus-daemon accepts up to 5 next-engine hot-keys.
const char kHotkeyNextEngineInMenu[] =
"Shift+Alt+Release+Shift_L,Shift+Alt+Release+Meta_L,Control+Shift+space,"
- "Zenkaku_Hankaku";
-// TODO(suzhe): Add more key bindings?
+ "Zenkaku_Hankaku,Hangul";
const char kHotkeyPreviousEngine[] = "Control+space";
// ---------------------------------------------------------------------------
@@ -127,11 +124,9 @@ const LanguageMultipleChoicePreference<int> kChewingHsuSelKeyType = {
const char kHangulSectionName[] = "engine/Hangul";
const char kHangulKeyboardConfigName[] = "HangulKeyboard";
const char kHangulHanjaKeysConfigName[] = "HanjaKeys";
-// We add Control+Alt+9 in addition to the two default keys since Hanja key
-// might not be available on the Chrome OS keyboard and F9 key is reserved by
-// the window manager.
-// TODO: Hanja keys are not configurable yet (and we're not sure if it should.)
-const char kHangulHanjaKeys[] = "F9,Hangul_Hanja,Control+Alt+9";
+// We add Control+9 since F9 key is reserved by the window manager.
+// TODO: HanjaKeys are not configurable yet (and we're not sure if it should.)
+const char kHangulHanjaKeys[] = "F9,Hangul_Hanja,Control+9";
const HangulKeyboardNameIDPair kHangulKeyboardNameIDPairs[] = {
// We have to sync the |keyboard_id|s with those in