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

ui/app_list/contents_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/app_list/contents_view.h"
 
 #include <algorithm>
 
 #include "ui/app_list/app_list_view.h"
 #include "ui/app_list/apps_grid_view.h"
@@ skipping 169 matching lines @@
                         results_size.height());
   return gfx::Size(width, height);
 }
 
 void ContentsView::Layout() {
   CalculateIdealBounds();
   views::ViewModelUtils::SetViewBoundsToIdealBounds(*view_model_);
 }
 
 ui::GestureStatus ContentsView::OnGestureEvent(
-    const views::GestureEvent& event) {
+    const ui::GestureEvent& event) {
   if (show_state_ != SHOW_APPS)
     return ui::GESTURE_STATUS_UNKNOWN;
 
   switch (event.type()) {
     case ui::ET_GESTURE_SCROLL_BEGIN:
       pagination_model_->StartScroll();
       return ui::GESTURE_STATUS_CONSUMED;
     case ui::ET_GESTURE_SCROLL_UPDATE:
       // event.details.scroll_x() > 0 means moving contents to right. That is,
       // transitioning to previous page.
@@ skipping 25 matching lines @@
     case SHOW_APPS:
       return GetAppsGridView(view_model_.get())->OnKeyPressed(event);
     case SHOW_SEARCH_RESULTS:
       return GetSearchResultListView(view_model_.get())->OnKeyPressed(event);
     default:
       NOTREACHED() << "Unknown show state " << show_state_;
   }
   return false;
 }
 
-bool ContentsView::OnMouseWheel(const views::MouseWheelEvent& event) {
+bool ContentsView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (show_state_ != SHOW_APPS)
     return false;
 
   if (abs(event.offset()) > kMinMouseWheelToSwitchPage) {
     if (!pagination_model_->has_transition())
       pagination_model_->SelectPageRelative(event.offset() > 0 ? -1 : 1, true);
     return true;
   }
 
   return false;
 }
 
-bool ContentsView::OnScrollEvent(const views::ScrollEvent & event) {
+bool ContentsView::OnScrollEvent(const ui::ScrollEvent& event) {
   if (show_state_ != SHOW_APPS)
     return false;
 
   if (abs(event.x_offset()) > kMinScrollToSwitchPage) {
     if (!pagination_model_->has_transition()) {
       pagination_model_->SelectPageRelative(event.x_offset() > 0 ? 1 : -1,
                                             true);
     }
     return true;
   }
 
   return false;
 }
 
 }  // namespace app_list