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

ui/views/controls/menu/menu_controller.cc

Index: ui/views/controls/menu/menu_controller.cc
===================================================================
--- ui/views/controls/menu/menu_controller.cc	(revision 151481)
+++ ui/views/controls/menu/menu_controller.cc	(working copy)
@@ -530,14 +530,15 @@
 
 #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);
@@ -586,12 +587,12 @@
 }
 
 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());
@@ -658,7 +659,7 @@
 }
 
 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.