| Index: views/controls/menu/menu_controller.cc
|
| diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
|
| index affddebd5efcc91adb946dd080f44c99dec46948..e0701a2cb9a9cf8d3a43c5595dbbe36ac2304254 100644
|
| --- a/views/controls/menu/menu_controller.cc
|
| +++ b/views/controls/menu/menu_controller.cc
|
| @@ -25,6 +25,10 @@
|
| #include "app/keyboard_code_conversion_gtk.h"
|
| #endif
|
|
|
| +#if defined(TOUCH_UI)
|
| +#include "views/focus/accelerator_handler.h"
|
| +#endif
|
| +
|
| using base::Time;
|
| using base::TimeDelta;
|
|
|
| @@ -848,12 +852,19 @@ bool MenuController::Dispatch(GdkEvent* event) {
|
| break;
|
| }
|
|
|
| - // We don not want Gtk to handle keyboard events, otherwise if they get
|
| + // We don't want Gtk to handle keyboard events, otherwise if they get
|
| // handled by Gtk, unexpected behavior may occur. For example Tab key
|
| // may cause unexpected focus traversing.
|
| gtk_main_do_event(event);
|
| return exit_type_ == EXIT_NONE;
|
| }
|
| +
|
| +#if defined(TOUCH_UI)
|
| +bool MenuController::Dispatch(XEvent* xev) {
|
| + return DispatchXEvent(xev);
|
| +}
|
| +#endif
|
| +
|
| #endif
|
|
|
| bool MenuController::OnKeyDown(int key_code
|
|
|