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

ui/views/controls/scroll_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/scroll_view.h"
 
 #include "base/logging.h"
 #include "ui/base/event.h"
 #include "ui/views/controls/scrollbar/native_scroll_bar.h"
 #include "ui/views/widget/root_view.h"
@@ skipping 382 matching lines @@
   // Give vertical scrollbar priority
   if (vert_sb_->visible())
     processed = vert_sb_->OnKeyPressed(event);
 
   if (!processed && horiz_sb_->visible())
     processed = horiz_sb_->OnKeyPressed(event);
 
   return processed;
 }
 
-ui::GestureStatus ScrollView::OnGestureEvent(const GestureEvent& event) {
+ui::GestureStatus ScrollView::OnGestureEvent(const ui::GestureEvent& event) {
   ui::GestureStatus status = ui::GESTURE_STATUS_UNKNOWN;
 
   // If the event happened on one of the scrollbars, then those events are
   // sent directly to the scrollbars. Otherwise, only scroll events are sent to
   // the scrollbars.
   bool scroll_event = event.type() == ui::ET_GESTURE_SCROLL_UPDATE ||
                       event.type() == ui::ET_GESTURE_SCROLL_BEGIN ||
                       event.type() == ui::ET_GESTURE_SCROLL_END;
 
   if (vert_sb_->visible()) {
     if (vert_sb_->bounds().Contains(event.location()) || scroll_event)
       status = vert_sb_->OnGestureEvent(event);
   }
   if (status == ui::GESTURE_STATUS_UNKNOWN && horiz_sb_->visible()) {
     if (horiz_sb_->bounds().Contains(event.location()) || scroll_event)
       status = horiz_sb_->OnGestureEvent(event);
   }
   return status;
 }
 
-bool ScrollView::OnMouseWheel(const MouseWheelEvent& e) {
+bool ScrollView::OnMouseWheel(const ui::MouseWheelEvent& e) {
   bool processed = false;
   // Give vertical scrollbar priority
   if (vert_sb_->visible())
     processed = vert_sb_->OnMouseWheel(e);
 
   if (!processed && horiz_sb_->visible())
     processed = horiz_sb_->OnMouseWheel(e);
 
   return processed;
 }
@@ skipping 77 matching lines @@
 
 VariableRowHeightScrollHelper::RowInfo
     FixedRowHeightScrollHelper::GetRowInfo(int y) {
   if (y < top_margin_)
     return RowInfo(0, top_margin_);
   return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_,
                  row_height_);
 }
 
 }  // namespace views