| Index: views/controls/menu/menu_controller.cc
|
| diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
|
| index e0701a2cb9a9cf8d3a43c5595dbbe36ac2304254..b324d6411b0b6a91ee6bd0496b1d0b2a83c8a921 100644
|
| --- a/views/controls/menu/menu_controller.cc
|
| +++ b/views/controls/menu/menu_controller.cc
|
| @@ -860,8 +860,14 @@ bool MenuController::Dispatch(GdkEvent* event) {
|
| }
|
|
|
| #if defined(TOUCH_UI)
|
| -bool MenuController::Dispatch(XEvent* xev) {
|
| - return DispatchXEvent(xev);
|
| +base::MessagePumpGlibXDispatcher::DispatchStatus MenuController::Dispatch(
|
| + XEvent* xev) {
|
| + if (!DispatchXEvent(xev))
|
| + return EVENT_IGNORED;
|
| +
|
| + return exit_type_ != EXIT_NONE ?
|
| + base::MessagePumpGlibXDispatcher::EVENT_QUIT :
|
| + base::MessagePumpGlibXDispatcher::EVENT_PROCESSED;
|
| }
|
| #endif
|
|
|
|
|