summaryrefslogtreecommitdiffstats
path: root/views/controls/menu/menu_controller.cc
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls/menu/menu_controller.cc')
-rw-r--r--views/controls/menu/menu_controller.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 625199d..80c081d 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)
@@ -718,6 +723,7 @@ bool MenuController::OnKeyDown(int key_code
#endif
) {
DCHECK(blocking_run_);
+ DLOG(WARNING) << "OnKeyDown: " << key_code;
switch (key_code) {
case base::VKEY_UP: