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

chrome/browser/ui/views/tabs/tab_strip.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 "chrome/browser/ui/views/tabs/tab_strip.h"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
 #endif
 
@@ skipping 40 matching lines @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/views/widget/monitor_win.h"
 #endif
 
 using content::UserMetricsAction;
-using views::DropTargetEvent;
+using ui::DropTargetEvent;
 
 namespace {
 
 static const int kTabStripAnimationVSlop = 40;
 // Inactive tabs in a native frame are slightly transparent.
 static const int kNativeFrameInactiveTabAlpha = 200;
 // If there are multiple tabs selected then make non-selected inactive tabs
 // even more transparent.
 static const int kNativeFrameInactiveTabAlphaMultiSelection = 150;
 
@@ skipping 218 matching lines @@
   }
 
  protected:
   // Overridden from views::View:
   virtual bool HasHitTestMask() const OVERRIDE;
   virtual void GetHitTestMask(gfx::Path* path) const OVERRIDE;
 #if defined(OS_WIN) && !defined(USE_AURA)
   void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
 #endif
   virtual ui::GestureStatus OnGestureEvent(
-      const views::GestureEvent& event) OVERRIDE;
+      const ui::GestureEvent& event) OVERRIDE;
   void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   bool ShouldUseNativeFrame() const;
   gfx::ImageSkia GetBackgroundImage(views::CustomButton::ButtonState state,
                                     ui::ScaleFactor scale_factor) const;
   gfx::ImageSkia GetImageForState(views::CustomButton::ButtonState state,
                                   ui::ScaleFactor scale_factor) const;
   gfx::ImageSkia GetImage(ui::ScaleFactor scale_factor) const;
 
@@ skipping 48 matching lines @@
     views::View::ConvertPointToScreen(this, &point);
     ui::ShowSystemMenu(GetWidget()->GetNativeView(), point.x(), point.y());
     SetState(BS_NORMAL);
     return;
   }
   views::ImageButton::OnMouseReleased(event);
 }
 #endif
 
 ui::GestureStatus NewTabButton::OnGestureEvent(
-    const views::GestureEvent& event) {
+    const ui::GestureEvent& event) {
   // Consume all gesture events here so that the parent (BaseTab) does not
   // start consuming gestures.
   views::ImageButton::OnGestureEvent(event);
   return ui::GESTURE_STATUS_CONSUMED;
 }
 
 void NewTabButton::OnPaint(gfx::Canvas* canvas) {
   gfx::ImageSkia image = GetImage(canvas->scale_factor());
   canvas->DrawImageInt(image, 0, height() - image.height());
 }
@@ skipping 1023 matching lines @@
 
 void TabStrip::OnMouseCaptureLost() {
   EndDrag(true);
 }
 
 void TabStrip::OnMouseMoved(const ui::MouseEvent& event) {
   UpdateLayoutTypeFromMouseEvent(this, event);
 }
 
 ui::GestureStatus TabStrip::OnGestureEvent(
-    const views::GestureEvent& event) {
+    const ui::GestureEvent& event) {
   switch (event.type()) {
     case ui::ET_GESTURE_END:
       EndDrag(false);
       if (adjust_layout_ && ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
         SetLayoutType(TAB_STRIP_LAYOUT_STACKED, true);
         controller_->LayoutTypeMaybeChanged();
       }
       break;
 
     case ui::ET_GESTURE_LONG_PRESS:
@@ skipping 680 matching lines @@
           GetDropArrowImage(drop_info_->point_down));
     }
   }
 
   // Reposition the window. Need to show it too as the window is initially
   // hidden.
   drop_info_->arrow_window->SetBounds(drop_bounds);
   drop_info_->arrow_window->Show();
 }
 
-int TabStrip::GetDropEffect(const views::DropTargetEvent& event) {
+int TabStrip::GetDropEffect(const ui::DropTargetEvent& event) {
   const int source_ops = event.source_operations();
   if (source_ops & ui::DragDropTypes::DRAG_COPY)
     return ui::DragDropTypes::DRAG_COPY;
   if (source_ops & ui::DragDropTypes::DRAG_LINK)
     return ui::DragDropTypes::DRAG_LINK;
   return ui::DragDropTypes::DRAG_MOVE;
 }
 
 // static
 gfx::ImageSkia* TabStrip::GetDropArrowImage(bool is_down) {
@@ skipping 236 matching lines @@
 
   int mini_tab_count = GetMiniTabCount();
   int normal_count = tab_count() - mini_tab_count;
   if (normal_count <= 1 || normal_count == mini_tab_count)
     return false;
   int x = GetStartXForNormalTabs();
   int available_width = width() - x - new_tab_button_width();
   return (Tab::GetTouchWidth() * normal_count +
           tab_h_offset() * (normal_count - 1)) > available_width;
 }