Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE…

ui/views/controls/menu/menu_controller.cc

 // Copyright (c) 2012 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 "ui/views/controls/menu/menu_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/run_loop.h"
 #include "base/time.h"
@@ skipping 512 matching lines @@
 }
 
 void MenuController::OnMouseEntered(SubmenuView* source,
                                     const ui::MouseEvent& event) {
   // MouseEntered is always followed by a mouse moved, so don't need to
   // do anything here.
 }
 
 #if defined(OS_LINUX)
 bool MenuController::OnMouseWheel(SubmenuView* source,
-                                  const MouseWheelEvent& event) {
+                                  const ui::MouseWheelEvent& event) {
   MenuPart part = GetMenuPart(source, event.location());
   return part.submenu && part.submenu->OnMouseWheel(event);
 }
 #endif
 
-ui::GestureStatus MenuController::OnGestureEvent(SubmenuView* source,
-                                                 const GestureEvent& event) {
+ui::GestureStatus MenuController::OnGestureEvent(
+    SubmenuView* source,
+    const ui::GestureEvent& event) {
   MenuPart part = GetMenuPart(source, event.location());
   if (event.type() == ui::ET_GESTURE_TAP_DOWN) {
     SetSelectionOnPointerDown(source, event);
     return ui::GESTURE_STATUS_CONSUMED;
   } else if (event.type() == ui::ET_GESTURE_LONG_PRESS) {
     if (part.type == MenuPart::MENU_ITEM && part.menu) {
       if (ShowContextMenu(part.menu, source, event))
         return ui::GESTURE_STATUS_CONSUMED;
     }
   } else if (event.type() == ui::ET_GESTURE_TAP) {
@@ skipping 28 matching lines @@
   return source->GetMenuItem()->GetDelegate()->AreDropTypesRequired(
       source->GetMenuItem());
 }
 
 bool MenuController::CanDrop(SubmenuView* source, const OSExchangeData& data) {
   return source->GetMenuItem()->GetDelegate()->CanDrop(source->GetMenuItem(),
                                                        data);
 }
 
 void MenuController::OnDragEntered(SubmenuView* source,
-                                   const DropTargetEvent& event) {
+                                   const ui::DropTargetEvent& event) {
   valid_drop_coordinates_ = false;
 }
 
 int MenuController::OnDragUpdated(SubmenuView* source,
-                                  const DropTargetEvent& event) {
+                                  const ui::DropTargetEvent& event) {
   StopCancelAllTimer();
 
   gfx::Point screen_loc(event.location());
   View::ConvertPointToScreen(source, &screen_loc);
   if (valid_drop_coordinates_ && screen_loc == drop_pt_)
     return last_drop_operation_;
   drop_pt_ = screen_loc;
   valid_drop_coordinates_ = true;
 
   MenuItemView* menu_item = GetMenuItemAt(source, event.x(), event.y());
@@ skipping 46 matching lines @@
 void MenuController::OnDragExited(SubmenuView* source) {
   StartCancelAllTimer();
 
   if (drop_target_) {
     StopShowTimer();
     SetDropMenuItem(NULL, MenuDelegate::DROP_NONE);
   }
 }
 
 int MenuController::OnPerformDrop(SubmenuView* source,
-                                  const DropTargetEvent& event) {
+                                  const ui::DropTargetEvent& event) {
   DCHECK(drop_target_);
   // NOTE: the delegate may delete us after invoking OnPerformDrop, as such
   // we don't call cancel here.
 
   MenuItemView* item = state_.item;
   DCHECK(item);
 
   MenuItemView* drop_target = drop_target_;
   MenuDelegate::DropPosition drop_position = drop_position_;
 
@@ skipping 1471 matching lines @@
 
 #if defined(USE_AURA)
 void MenuController::OnWindowActivated(aura::Window* active,
                                        aura::Window* old_active) {
   if (!drag_in_progress_)
     Cancel(EXIT_ALL);
 }
 #endif
 
 }  // namespace views