Replace views::MouseEvent with ui::MouseEvent

ash/system/tray/tray_views.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/system/tray/tray_views.h"
 
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
@@ skipping 101 matching lines @@
 
 void ActionableView::DrawBorder(gfx::Canvas* canvas, const gfx::Rect& bounds) {
   gfx::Rect rect = bounds;
   rect.Inset(1, 1, 3, 3);
   canvas->DrawRect(rect, kFocusBorderColor);
 }
 
 bool ActionableView::OnKeyPressed(const ui::KeyEvent& event) {
   if (event.key_code() == ui::VKEY_SPACE ||
       event.key_code() == ui::VKEY_RETURN) {
-    // TODO(beng): remove once views::Event is gone.
-    views::MouseEvent synthetic_event(
-        ui::ET_MOUSE_RELEASED, 0, 0, ui::EF_LEFT_MOUSE_BUTTON);
-    return PerformAction(synthetic_event);
+    return PerformAction(event);
   }
   return false;
 }
 
-bool ActionableView::OnMousePressed(const views::MouseEvent& event) {
+bool ActionableView::OnMousePressed(const ui::MouseEvent& event) {
   // Return true so that this view starts capturing the events.
   has_capture_ = true;
   return true;
 }
 
-void ActionableView::OnMouseReleased(const views::MouseEvent& event) {
+void ActionableView::OnMouseReleased(const ui::MouseEvent& event) {
   if (has_capture_ && GetLocalBounds().Contains(event.location()))
     PerformAction(event);
 }
 
 void ActionableView::OnMouseCaptureLost() {
   has_capture_ = false;
 }
 
 void ActionableView::SetAccessibleName(const string16& name) {
   accessible_name_ = name;
@@ skipping 78 matching lines @@
   return true;
 }
 
 gfx::Size HoverHighlightView::GetPreferredSize() {
   gfx::Size size = ActionableView::GetPreferredSize();
   if (fixed_height_)
     size.set_height(fixed_height_);
   return size;
 }
 
-void HoverHighlightView::OnMouseEntered(const views::MouseEvent& event) {
+void HoverHighlightView::OnMouseEntered(const ui::MouseEvent& event) {
   hover_ = true;
   if (text_highlight_color_ && text_label_)
     text_label_->SetEnabledColor(text_highlight_color_);
   SchedulePaint();
 }
 
-void HoverHighlightView::OnMouseExited(const views::MouseEvent& event) {
+void HoverHighlightView::OnMouseExited(const ui::MouseEvent& event) {
   hover_ = false;
   if (text_default_color_ && text_label_)
     text_label_->SetEnabledColor(text_default_color_);
   SchedulePaint();
 }
 
 void HoverHighlightView::OnEnabledChanged() {
   for (int i = 0; i < child_count(); ++i)
     child_at(i)->SetEnabled(enabled());
 }
@@ skipping 51 matching lines @@
   }
 }
 
 void FixedSizedScrollView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   views::View* contents = GetContents();
   gfx::Rect bounds = gfx::Rect(contents->GetPreferredSize());
   bounds.set_width(std::max(0, width() - GetScrollBarWidth()));
   contents->SetBoundsRect(bounds);
 }
 
-void FixedSizedScrollView::OnMouseEntered(const views::MouseEvent& event) {
+void FixedSizedScrollView::OnMouseEntered(const ui::MouseEvent& event) {
   // TODO(sad): This is done to make sure that the scroll view scrolls on
   // mouse-wheel events. This is ugly, and Ben thinks this is weird. There
   // should be a better fix for this.
   RequestFocus();
 }
 
 void FixedSizedScrollView::OnPaintFocusBorder(gfx::Canvas* canvas) {
   // Do not paint the focus border.
 }
 
@@ skipping 14 matching lines @@
 }
 
 TrayPopupTextButton::~TrayPopupTextButton() {}
 
 gfx::Size TrayPopupTextButton::GetPreferredSize() {
   gfx::Size size = views::TextButton::GetPreferredSize();
   size.Enlarge(32, 16);
   return size;
 }
 
-void TrayPopupTextButton::OnMouseEntered(const views::MouseEvent& event) {
+void TrayPopupTextButton::OnMouseEntered(const ui::MouseEvent& event) {
   hover_ = true;
   SchedulePaint();
 }
 
-void TrayPopupTextButton::OnMouseExited(const views::MouseEvent& event) {
+void TrayPopupTextButton::OnMouseExited(const ui::MouseEvent& event) {
   hover_ = false;
   SchedulePaint();
 }
 
 void TrayPopupTextButton::OnPaintBackground(gfx::Canvas* canvas) {
   if (hover_)
     hover_bg_->Paint(canvas, this);
   else
     views::TextButton::OnPaintBackground(canvas);
 }
@@ skipping 287 matching lines @@
     tray_view->set_border(views::Border::CreateEmptyBorder(
         kTrayLabelItemVerticalPaddingVeriticalAlignment,
         horizontal_padding,
         kTrayLabelItemVerticalPaddingVeriticalAlignment,
         horizontal_padding));
   }
 }
 
 }  // namespace internal
 }  // namespace ash