diff options
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/input_method/input_method_util.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/chromeos/language_preferences.cc | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index 40afcc6..8594b41 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -220,6 +220,8 @@ const struct EnglishToResouceId { { "Canada", IDS_STATUSBAR_LAYOUT_CANADA }, { "Canada - English", IDS_STATUSBAR_LAYOUT_CANADA_ENGLISH }, { "Israel", IDS_STATUSBAR_LAYOUT_ISRAEL }, + { "Korea, Republic of - 101/104 key Compatible", + IDS_STATUSBAR_LAYOUT_KOREA_104 }, }; const size_t kNumEntries = arraysize(kEnglishToResourceIdArray); 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 |