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

ui/views/controls/scrollbar/base_scroll_bar.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/scrollbar/base_scroll_bar.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 149 matching lines @@
     default:
       break;
   }
   if (amount != SCROLL_NONE) {
     ScrollByAmount(amount);
     return true;
   }
   return false;
 }
 
-ui::GestureStatus BaseScrollBar::OnGestureEvent(const GestureEvent& event) {
+ui::GestureStatus BaseScrollBar::OnGestureEvent(const ui::GestureEvent& event) {
   if (event.type() == ui::ET_GESTURE_TAP_DOWN) {
     ProcessPressEvent(event);
     return ui::GESTURE_STATUS_CONSUMED;
   }
 
   if (event.type() == ui::ET_GESTURE_LONG_PRESS) {
     // For a long-press, the repeater started in tap-down should continue. So
     // return early.
     return ui::GESTURE_STATUS_UNKNOWN;
   }
@@ skipping 12 matching lines @@
 
   if (event.type() == ui::ET_GESTURE_SCROLL_UPDATE) {
     ScrollByContentsOffset(IsHorizontal() ? event.details().scroll_x() :
                                             event.details().scroll_y());
     return ui::GESTURE_STATUS_CONSUMED;
   }
 
   return ui::GESTURE_STATUS_UNKNOWN;
 }
 
-bool BaseScrollBar::OnMouseWheel(const MouseWheelEvent& event) {
+bool BaseScrollBar::OnMouseWheel(const ui::MouseWheelEvent& event) {
   ScrollByContentsOffset(event.offset());
   return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BaseScrollBar, ContextMenuController implementation:
 
 enum ScrollBarContextMenuCommands {
   ScrollBarContextMenuCommand_ScrollHere = 1,
   ScrollBarContextMenuCommand_ScrollStart,
@@ skipping 209 matching lines @@
     thumb_position = thumb_position - (thumb_->GetSize() / 2);
   return (thumb_position * contents_size_) / GetTrackSize();
 }
 
 void BaseScrollBar::SetThumbTrackState(CustomButton::ButtonState state) {
   thumb_track_state_ = state;
   SchedulePaint();
 }
 
 }  // namespace views