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

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

Issue 5110011: A non-GTK version of menus for touchui. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix compile for touch on chromeos Created 10 years 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 | « views/controls/menu/menu_controller.h ('k') | views/controls/menu/menu_item_view.h » ('j') | 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 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
« no previous file with comments | « views/controls/menu/menu_controller.h ('k') | views/controls/menu/menu_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698