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.cc18
1 files changed, 1 insertions, 17 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 90dd6b2..71960a85 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -26,16 +26,10 @@
#if defined(USE_AURA)
#include "ui/aura/desktop.h"
-#endif
-
-#if defined(TOOLKIT_USES_GTK)
+#elif defined(TOOLKIT_USES_GTK)
#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
#endif
-#if defined(TOUCH_UI)
-#include "ui/views/focus/accelerator_handler.h"
-#endif
-
using base::Time;
using base::TimeDelta;
using ui::OSExchangeData;
@@ -917,16 +911,6 @@ base::MessagePumpDispatcher::DispatchStatus
base::MessagePumpDispatcher::EVENT_QUIT :
base::MessagePumpDispatcher::EVENT_PROCESSED;
}
-#elif defined(TOUCH_UI)
-base::MessagePumpDispatcher::DispatchStatus
- MenuController::Dispatch(XEvent* xev) {
- if (!DispatchXEvent(xev))
- return EVENT_IGNORED;
-
- return exit_type_ != EXIT_NONE ?
- base::MessagePumpDispatcher::EVENT_QUIT :
- base::MessagePumpDispatcher::EVENT_PROCESSED;
-}
#else
bool MenuController::Dispatch(GdkEvent* event) {
if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) {