diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 05:56:48 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 05:56:48 +0000 |
| commit | a67e851f7913d42e4e550062d23779acec333aab (patch) | |
| tree | bb7d86ade224d51777188dc5d46d6ecd4efd327b /views | |
| parent | 5666c782910200090a3abe6c2d7cb944cc3a5457 (diff) | |
| download | chromium_src-a67e851f7913d42e4e550062d23779acec333aab.zip chromium_src-a67e851f7913d42e4e550062d23779acec333aab.tar.gz chromium_src-a67e851f7913d42e4e550062d23779acec333aab.tar.bz2 | |
Relanding:
BookmarkBarView tests fixes
* Add BOOKMARK_CONTEXT_MENU_SHOWN notification. On Linux, event handling is asynchronous, but the showing context menu is blocking,
so we can't use RunAllPending().
* Convert gtk keycode to Win when checking accelerator.
BUG=39736
TEST=none (interactive_ui_tests should pass once enabled
it'll be enabled by http://codereview.chromium.org/1576008
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=43699
Review URL: http://codereview.chromium.org/1545011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index 625199d..b162c72 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -18,6 +18,9 @@ #include "views/view_constants.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" +#if defined(OS_LINUX) +#include "base/keyboard_code_conversion_gtk.h" +#endif using base::Time; using base::TimeDelta; @@ -695,7 +698,9 @@ bool MenuController::Dispatch(GdkEvent* event) { switch (event->type) { case GDK_KEY_PRESS: { - if (!OnKeyDown(event->key.keyval)) + base::KeyboardCode win_keycode = + base::WindowsKeyCodeForGdkKeyCode(event->key.keyval); + if (!OnKeyDown(win_keycode)) return false; guint32 keycode = gdk_keyval_to_unicode(event->key.keyval); if (keycode) |