Remove remaining defined(TOUCH_UI) under views/controls

views/controls/menu/menu_controller.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/menu/menu_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/events.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_controller_delegate.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/drag_utils.h"
 #include "views/view_constants.h"
 #include "views/views_delegate.h"
 
 #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;
 
 // Period of the scroll timer (in milliseconds).
 static const int kScrollTimerMS = 30;
 
 // Delay, in ms, between when menus are selected are moused over and the menu
 // appears.
 static const int kShowDelay = 400;
@@ skipping 861 matching lines @@
 
   // TODO(oshima): Update Windows' Dispatcher to return DispatchStatus
   // instead of bool.
   if (aura::Desktop::GetInstance()->GetDispatcher()->Dispatch(xev) ==
       base::MessagePumpDispatcher::EVENT_IGNORED)
     return EVENT_IGNORED;
   return exit_type_ != EXIT_NONE ?
       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) {
     gtk_main_do_event(event);
     return false;
   }
 
   switch (event->type) {
     case GDK_KEY_PRESS: {
       if (!OnKeyDown(ui::WindowsKeyCodeForGdkKeyCode(event->key.keyval)))
@@ skipping 1022 matching lines @@
   // is necessary to exit from nested loop (See Dispatch methods).
   // Send non-op event so that Dispatch method will always be called.
   // crbug.com/104684.
   if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED)
     aura::Desktop::GetInstance()->PostNativeEvent(ui::CreateNoopEvent());
 #endif
 }
 
 
 }  // namespace views