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

chrome/browser/ui/views/location_bar/content_setting_image_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 "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/animation/tween.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
-#include "ui/views/events/event.h"
 #include "ui/views/widget/widget.h"
 
 using content::WebContents;
 
 namespace {
 // Animation parameters.
 const int kOpenTimeMs = 150;
 const int kFullOpenedTimeMs = 3200;
 const int kMoveTimeMs = kFullOpenedTimeMs + 2 * kOpenTimeMs;
 const int kFrameRateHz = 60;
@@ skipping 89 matching lines @@
 }
 
 gfx::Size ContentSettingImageView::GetPreferredSize() {
   gfx::Size preferred_size(views::ImageView::GetPreferredSize());
   // When view is animated visible_text_size_ > 0, it is 0 otherwise.
   preferred_size.set_width(preferred_size.width() + visible_text_size_);
   return preferred_size;
 }
 
 ui::GestureStatus ContentSettingImageView::OnGestureEvent(
-    const views::GestureEvent& event) {
+    const ui::GestureEvent& event) {
   if (event.type() == ui::ET_GESTURE_TAP) {
     OnClick();
     return ui::GESTURE_STATUS_CONSUMED;
   } else if (event.type() == ui::ET_GESTURE_TAP_DOWN) {
     return ui::GESTURE_STATUS_CONSUMED;
   }
 
   return ui::GESTURE_STATUS_UNKNOWN;
 }
 
@@ skipping 150 matching lines @@
   return kBorderColor;
 }
 
 SkColor ContentSettingImageView::GradientTopColor() const {
   return kTopBoxColor;
 }
 
 SkColor ContentSettingImageView::GradientBottomColor() const {
   return kBottomBoxColor;
 }