Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Unified Diff: views/controls/menu/menu_controller.cc

Issue 1545011: BookmarkBarView tests fixes (Closed)
Patch Set: remove unnecessary change (correct one this time) Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/notification_type.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_controller.cc
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 625199df803a42b7d8734823d014e382ffca0a3a..b162c724dcfc8c9e25b88d8ce9cf231ce01598a7 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)
« no previous file with comments | « chrome/common/notification_type.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698