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

ui/views/controls/menu/submenu_view.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/submenu_view.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ skipping 162 matching lines @@
 bool SubmenuView::AreDropTypesRequired() {
   DCHECK(GetMenuItem()->GetMenuController());
   return GetMenuItem()->GetMenuController()->AreDropTypesRequired(this);
 }
 
 bool SubmenuView::CanDrop(const OSExchangeData& data) {
   DCHECK(GetMenuItem()->GetMenuController());
   return GetMenuItem()->GetMenuController()->CanDrop(this, data);
 }
 
-void SubmenuView::OnDragEntered(const DropTargetEvent& event) {
+void SubmenuView::OnDragEntered(const ui::DropTargetEvent& event) {
   DCHECK(GetMenuItem()->GetMenuController());
   GetMenuItem()->GetMenuController()->OnDragEntered(this, event);
 }
 
-int SubmenuView::OnDragUpdated(const DropTargetEvent& event) {
+int SubmenuView::OnDragUpdated(const ui::DropTargetEvent& event) {
   DCHECK(GetMenuItem()->GetMenuController());
   return GetMenuItem()->GetMenuController()->OnDragUpdated(this, event);
 }
 
 void SubmenuView::OnDragExited() {
   DCHECK(GetMenuItem()->GetMenuController());
   GetMenuItem()->GetMenuController()->OnDragExited(this);
 }
 
-int SubmenuView::OnPerformDrop(const DropTargetEvent& event) {
+int SubmenuView::OnPerformDrop(const ui::DropTargetEvent& event) {
   DCHECK(GetMenuItem()->GetMenuController());
   return GetMenuItem()->GetMenuController()->OnPerformDrop(this, event);
 }
 
-bool SubmenuView::OnMouseWheel(const MouseWheelEvent& e) {
+bool SubmenuView::OnMouseWheel(const ui::MouseWheelEvent& e) {
   gfx::Rect vis_bounds = GetVisibleBounds();
   int menu_item_count = GetMenuItemCount();
   if (vis_bounds.height() == height() || !menu_item_count) {
     // All menu items are visible, nothing to scroll.
     return true;
   }
 
   // Find the index of the first menu item whose y-coordinate is >= visible
   // y-coordinate.
   int i = 0;
   while ((i < menu_item_count) && (GetMenuItemAt(i)->y() < vis_bounds.y()))
     ++i;
   if (i == menu_item_count)
     return true;
   int first_vis_index = std::max(0,
       (GetMenuItemAt(i)->y() == vis_bounds.y()) ? i : i - 1);
 
   // If the first item isn't entirely visible, make it visible, otherwise make
   // the next/previous one entirely visible.
-  int delta = abs(e.offset() / MouseWheelEvent::kWheelDelta);
+  int delta = abs(e.offset() / ui::MouseWheelEvent::kWheelDelta);
   for (bool scroll_up = (e.offset() > 0); delta != 0; --delta) {
     int scroll_target;
     if (scroll_up) {
       if (GetMenuItemAt(first_vis_index)->y() == vis_bounds.y()) {
         if (first_vis_index == 0)
           break;
         first_vis_index--;
       }
       scroll_target = GetMenuItemAt(first_vis_index)->y();
     } else {
       if (first_vis_index + 1 == menu_item_count)
         break;
       scroll_target = GetMenuItemAt(first_vis_index + 1)->y();
       if (GetMenuItemAt(first_vis_index)->y() == vis_bounds.y())
         first_vis_index++;
     }
     ScrollRectToVisible(gfx::Rect(gfx::Point(0, scroll_target),
                                   vis_bounds.size()));
     vis_bounds = GetVisibleBounds();
   }
 
   return true;
 }
 
-ui::GestureStatus SubmenuView::OnGestureEvent(const GestureEvent& e) {
+ui::GestureStatus SubmenuView::OnGestureEvent(const ui::GestureEvent& e) {
   ui::GestureStatus to_return = ui::GESTURE_STATUS_CONSUMED;
   switch (e.type()) {
     case ui::ET_GESTURE_SCROLL_BEGIN:
       scroll_animator_->Stop();
       break;
     case ui::ET_GESTURE_SCROLL_UPDATE:
       OnScroll(0, e.details().scroll_y());
       break;
     case ui::ET_GESTURE_SCROLL_END:
       break;
@@ skipping 172 matching lines @@
   int y = vis_bounds.y() - static_cast<int>(dy);
   // clamp y to [0, full_height - vis_height)
   y = std::max(y, 0);
   y = std::min(y, full_bounds.height() - vis_bounds.height() - 1);
   gfx::Rect new_vis_bounds(x, y, vis_bounds.width(), vis_bounds.height());
   if (new_vis_bounds != vis_bounds)
     ScrollRectToVisible(new_vis_bounds);
 }
 
 }  // namespace views