summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsuzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-29 02:35:57 +0000
committersuzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-29 02:35:57 +0000
commit5b7680926ee4ffd9213346ff0c9aaf764265585f (patch)
tree342d8c769c171a11a4b97bd3fce2fbf5a8682bb4
parente3ee789b3264d7a36ec6f84d112d61acc16ac750 (diff)
downloadchromium_src-5b7680926ee4ffd9213346ff0c9aaf764265585f.zip
chromium_src-5b7680926ee4ffd9213346ff0c9aaf764265585f.tar.gz
chromium_src-5b7680926ee4ffd9213346ff0c9aaf764265585f.tar.bz2
[chromeos]Fix input method switching shortcut keys.
BUG=http://crosbug.com/3892 TEST=manually Review URL: http://codereview.chromium.org/2835023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51092 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/language_preferences.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h
index 278e703..0862987 100644
--- a/chrome/browser/chromeos/language_preferences.h
+++ b/chrome/browser/chromeos/language_preferences.h
@@ -49,18 +49,13 @@ const char kPreloadEnginesConfigName[] = "preload_engines";
const char kNextEngineInMenuConfigName[] = "next_engine_in_menu";
const char kPreviousEngineConfigName[] = "previous_engine";
-// TODO(suzhe): In order to avoid blocking any accelerator keys with alt+shift
-// modifiers, we should use release events of alt+shift key binding instead of
-// press events. The corresponding release events are:
-// "Alt+Shift+Shift_L+Release" and "Alt+Shift+Meta_L+Release"
-// But unfortunately http://crbug.com/40754 prevents these release events
-// from taking effect.
// 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[] =
- "Alt+Shift_L,Shift+Meta_L,Control+Shift+space,Zenkaku_Hankaku";
+ "Shift+Alt+Release+Shift_L,Shift+Alt+Release+Meta_L,Control+Shift+space,"
+ "Zenkaku_Hankaku";
// TODO(suzhe): Add more key bindings?
const char kHotkeyPreviousEngine[] = "Control+space";