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

ash/launcher/overflow_bubble.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 "ash/launcher/overflow_bubble.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_types.h"
 #include "ash/launcher/launcher_view.h"
@@ skipping 57 matching lines @@
     return static_cast<views::View*>(launcher_view_)->GetPreferredSize();
   }
 
   void ScrollByXOffset(int x_offset);
   void ScrollByYOffset(int y_offset);
 
   // views::View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
-  virtual bool OnMouseWheel(const views::MouseWheelEvent& event) OVERRIDE;
-  virtual bool OnScrollEvent(const views::ScrollEvent & event) OVERRIDE;
+  virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
+  virtual bool OnScrollEvent(const ui::ScrollEvent& event) OVERRIDE;
 
   // views::BubbleDelegate overrides:
   virtual gfx::Rect GetBubbleBounds() OVERRIDE;
 
   ShelfAlignment shelf_alignment_;
   LauncherView* launcher_view_;  // Owned by views hierarchy.
   gfx::Point scroll_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(OverflowBubbleView);
 };
@@ skipping 81 matching lines @@
 
 void OverflowBubbleView::ChildPreferredSizeChanged(views::View* child) {
   // Ensures |launch_view_| is still visible.
   ScrollByXOffset(0);
   ScrollByYOffset(0);
   Layout();
 
   SizeToContents();
 }
 
-bool OverflowBubbleView::OnMouseWheel(const views::MouseWheelEvent& event) {
+bool OverflowBubbleView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (is_horizontal_alignment())
     ScrollByXOffset(-event.offset());
   else
     ScrollByYOffset(-event.offset());
   Layout();
 
   return true;
 }
 
-bool OverflowBubbleView::OnScrollEvent(const views::ScrollEvent & event) {
+bool OverflowBubbleView::OnScrollEvent(const ui::ScrollEvent& event) {
   ScrollByXOffset(-event.x_offset());
   ScrollByYOffset(-event.y_offset());
   Layout();
   return true;
 }
 
 gfx::Rect OverflowBubbleView::GetBubbleBounds() {
   views::BubbleBorder* border = GetBubbleFrameView()->bubble_border();
   gfx::Insets bubble_insets;
   border->GetInsets(&bubble_insets);
@@ skipping 79 matching lines @@
   bubble_ = NULL;
 }
 
 void OverflowBubble::OnWidgetClosing(views::Widget* widget) {
   DCHECK(widget == bubble_->GetWidget());
   bubble_ = NULL;
 }
 
 }  // namespace internal
 }  // namespace ash