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

ui/views/controls/menu/menu_controller.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 
 #include "build/build_config.h"
 
 #include <list>
@@ skipping 97 matching lines @@
   // Various events, forwarded from the submenu.
   //
   // NOTE: the coordinates of the events are in that of the
   // MenuScrollViewContainer.
   void OnMousePressed(SubmenuView* source, const ui::MouseEvent& event);
   void OnMouseDragged(SubmenuView* source, const ui::MouseEvent& event);
   void OnMouseReleased(SubmenuView* source, const ui::MouseEvent& event);
   void OnMouseMoved(SubmenuView* source, const ui::MouseEvent& event);
   void OnMouseEntered(SubmenuView* source, const ui::MouseEvent& event);
 #if defined(OS_LINUX)
-  bool OnMouseWheel(SubmenuView* source, const MouseWheelEvent& event);
+  bool OnMouseWheel(SubmenuView* source, const ui::MouseWheelEvent& event);
 #endif
   ui::GestureStatus OnGestureEvent(SubmenuView* source,
-                                   const GestureEvent& event);
+                                   const ui::GestureEvent& event);
 
   bool GetDropFormats(
       SubmenuView* source,
       int* formats,
       std::set<ui::OSExchangeData::CustomFormat>* custom_formats);
   bool AreDropTypesRequired(SubmenuView* source);
   bool CanDrop(SubmenuView* source, const ui::OSExchangeData& data);
-  void OnDragEntered(SubmenuView* source, const DropTargetEvent& event);
-  int OnDragUpdated(SubmenuView* source, const DropTargetEvent& event);
+  void OnDragEntered(SubmenuView* source, const ui::DropTargetEvent& event);
+  int OnDragUpdated(SubmenuView* source, const ui::DropTargetEvent& event);
   void OnDragExited(SubmenuView* source);
-  int OnPerformDrop(SubmenuView* source, const DropTargetEvent& event);
+  int OnPerformDrop(SubmenuView* source, const ui::DropTargetEvent& event);
 
   // Invoked from the scroll buttons of the MenuScrollViewContainer.
   void OnDragEnteredScrollButton(SubmenuView* source, bool is_up);
   void OnDragExitedScrollButton(SubmenuView* source);
 
   // Update the submenu's selection based on the current mouse location
   void UpdateSubmenuSelection(SubmenuView* source);
 
  private:
   friend class internal::MenuRunnerImpl;
@@ skipping 413 matching lines @@
   // How deep we are in nested message loops. This should be at most 2 (when
   // showing a context menu from a menu).
   int message_loop_depth_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_