Remove remaining defined(TOUCH_UI) under views/controls

views/controls/menu/menu_controller.cc

Index: views/controls/menu/menu_controller.cc
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 90dd6b278980245cd2665c9a4cf4cfb740d2c9f3..71960a85347a9ca3eef21320a1ad80ec54897107 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

[sky, 2011/11/22 22:39:18]

Does the header need to be updated too?

[Emmanuel Saint-loubert-Bié, 2011/11/22 22:42:38]

No the header is already clean (not sure why though, I assume someone else
cleanup).

-    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) {