diff options
| author | suzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 19:48:19 +0000 |
|---|---|---|
| committer | suzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 19:48:19 +0000 |
| commit | ee19cb20c9c5a0354d145a6a1ca950797b7cd3aa (patch) | |
| tree | 66a1f65060e653ff2a817c73c62505caee94b65f /views/focus/accelerator_handler_gtk_unittest.cc | |
| parent | e5a8c47bda7fe8e3d8491fdd74cd166da02b8a7b (diff) | |
| download | chromium_src-ee19cb20c9c5a0354d145a6a1ca950797b7cd3aa.zip chromium_src-ee19cb20c9c5a0354d145a6a1ca950797b7cd3aa.tar.gz chromium_src-ee19cb20c9c5a0354d145a6a1ca950797b7cd3aa.tar.bz2 | |
[Linux Views] Refactor accelerator handler related code.
This CL removes the accelerator handling logic in
accelerator_handler_gtk.cc and implements a much simpler solution in
WidgetGtk. The new approach always sends a key event to the focused View
and native GtkWidget first and only sends it to the focus manager if it's not
handled by any View or native GtkWidget.
BUG=23383 AcceleratorHandler on Windows should not dispatch the KEYUP messages eaten by the FocusManager
BUG=40966 BrowserKeyEventsTest.AccessKeys is crashy
BUG=49701 [Linux Views]Some Emacs keybindings are broken in omnibox and find in page box.
TEST=Press Alt key in different place (web page, omnibox, find bar, etc.) to see if menu bar can be focused correctly. Press alt-F to popup wrench menu and Escape to close it, then try alt key again.
Review URL: http://codereview.chromium.org/3046041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus/accelerator_handler_gtk_unittest.cc')
| -rw-r--r-- | views/focus/accelerator_handler_gtk_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/views/focus/accelerator_handler_gtk_unittest.cc b/views/focus/accelerator_handler_gtk_unittest.cc index ef05312..78e9110 100644 --- a/views/focus/accelerator_handler_gtk_unittest.cc +++ b/views/focus/accelerator_handler_gtk_unittest.cc @@ -99,7 +99,7 @@ TEST_F(AcceleratorHandlerGtkTest, TestHomepageAccelerator) { ASSERT_FALSE(menu_pressed_); ASSERT_FALSE(home_pressed_); - evt = CreateKeyEvent(GDK_KEY_PRESS, GDK_Menu, 0); + evt = CreateKeyEvent(GDK_KEY_PRESS, GDK_Alt_L, 0); EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt))); ASSERT_FALSE(menu_pressed_); @@ -113,7 +113,7 @@ TEST_F(AcceleratorHandlerGtkTest, TestHomepageAccelerator) { evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Home, GDK_MOD1_MASK); EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt))); - evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Menu, 0); + evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Alt_L, 0); EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt))); ASSERT_FALSE(menu_pressed_); @@ -127,12 +127,12 @@ TEST_F(AcceleratorHandlerGtkTest, TestMenuAccelerator) { ASSERT_FALSE(menu_pressed_); - evt = CreateKeyEvent(GDK_KEY_PRESS, GDK_Menu, 0); + evt = CreateKeyEvent(GDK_KEY_PRESS, GDK_Alt_L, 0); EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt))); ASSERT_FALSE(menu_pressed_); - evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Menu, 0); + evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Alt_L, 0); EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt))); ASSERT_TRUE(menu_pressed_); |