Replace views::MouseEvent with ui::MouseEvent

ui/views/controls/button/custom_button.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/views/controls/button/custom_button.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 90 matching lines @@
   if (enabled())
     SetState(IsMouseHovered() ? BS_HOT : BS_NORMAL);
   else
     SetState(BS_DISABLED);
 }
 
 std::string CustomButton::GetClassName() const {
   return kViewClassName;
 }
 
-bool CustomButton::OnMousePressed(const MouseEvent& event) {
+bool CustomButton::OnMousePressed(const ui::MouseEvent& event) {
   if (state_ != BS_DISABLED) {
     if (ShouldEnterPushedState(event) && HitTestPoint(event.location()))
       SetState(BS_PUSHED);
     if (request_focus_on_press_)
       RequestFocus();
   }
   return true;
 }
 
-bool CustomButton::OnMouseDragged(const MouseEvent& event) {
+bool CustomButton::OnMouseDragged(const ui::MouseEvent& event) {
   if (state_ != BS_DISABLED) {
     if (HitTestPoint(event.location()))
       SetState(ShouldEnterPushedState(event) ? BS_PUSHED : BS_HOT);
     else
       SetState(BS_NORMAL);
   }
   return true;
 }
 
-void CustomButton::OnMouseReleased(const MouseEvent& event) {
+void CustomButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (state_ == BS_DISABLED)
     return;
 
   if (!HitTestPoint(event.location())) {
     SetState(BS_NORMAL);
     return;
   }
 
   SetState(BS_HOT);
   if (IsTriggerableEvent(event)) {
     NotifyClick(event);
     // NOTE: We may be deleted at this point (by the listener's notification
     // handler).
   }
 }
 
 void CustomButton::OnMouseCaptureLost() {
   // Starting a drag results in a MouseCaptureLost, we need to ignore it.
   if (state_ != BS_DISABLED && !InDrag())
     SetState(BS_NORMAL);
 }
 
-void CustomButton::OnMouseEntered(const MouseEvent& event) {
+void CustomButton::OnMouseEntered(const ui::MouseEvent& event) {
   if (state_ != BS_DISABLED)
     SetState(BS_HOT);
 }
 
-void CustomButton::OnMouseExited(const MouseEvent& event) {
+void CustomButton::OnMouseExited(const ui::MouseEvent& event) {
   // Starting a drag results in a MouseExited, we need to ignore it.
   if (state_ != BS_DISABLED && !InDrag())
     SetState(BS_NORMAL);
 }
 
-void CustomButton::OnMouseMoved(const MouseEvent& event) {
+void CustomButton::OnMouseMoved(const ui::MouseEvent& event) {
   if (state_ != BS_DISABLED)
     SetState(HitTestPoint(event.location()) ? BS_HOT : BS_NORMAL);
 }
 
 bool CustomButton::OnKeyPressed(const ui::KeyEvent& event) {
   if (state_ == BS_DISABLED)
     return false;
 
   // Space sets button state to pushed. Enter clicks the button. This matches
   // the Windows native behavior of buttons, where Space clicks the button on
   // KeyRelease and Enter clicks the button on KeyPressed.
   if (event.key_code() == ui::VKEY_SPACE) {
     SetState(BS_PUSHED);
   } else if (event.key_code() == ui::VKEY_RETURN) {
     SetState(BS_NORMAL);
     // TODO(beng): remove once NotifyClick takes ui::Event.
-    views::MouseEvent synthetic_event(
-        ui::ET_MOUSE_RELEASED, 0, 0, ui::EF_LEFT_MOUSE_BUTTON);
+    ui::MouseEvent synthetic_event(ui::ET_MOUSE_RELEASED,
+                                   gfx::Point(),
+                                   gfx::Point(),
+                                   ui::EF_LEFT_MOUSE_BUTTON);
     NotifyClick(synthetic_event);
   } else {
     return false;
   }
   return true;
 }
 
 bool CustomButton::OnKeyReleased(const ui::KeyEvent& event) {
   if ((state_ == BS_DISABLED) || (event.key_code() != ui::VKEY_SPACE))
     return false;
 
   SetState(BS_NORMAL);
   // TODO(beng): remove once NotifyClick takes ui::Event.
-  views::MouseEvent synthetic_event(
-      ui::ET_MOUSE_RELEASED, 0, 0, ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent synthetic_event(ui::ET_MOUSE_RELEASED,
+                                 gfx::Point(),
+                                 gfx::Point(),
+                                 ui::EF_LEFT_MOUSE_BUTTON);
   NotifyClick(synthetic_event);
   return true;
 }
 
 ui::GestureStatus CustomButton::OnGestureEvent(const GestureEvent& event) {
   if (state_ == BS_DISABLED)
     return Button::OnGestureEvent(event);
 
   if (event.type() == ui::ET_GESTURE_TAP && IsTriggerableEvent(event)) {
     // Set the button state to hot and start the animation fully faded in. The
@@ skipping 15 matching lines @@
   return Button::OnGestureEvent(event);
 }
 
 bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) {
   SetState(BS_NORMAL);
   /*
   ui::KeyEvent key_event(ui::ET_KEY_RELEASED, accelerator.key_code(),
                          accelerator.modifiers());
                          */
   // TODO(beng): remove once NotifyClick takes ui::Event.
-  views::MouseEvent synthetic_event(
-      ui::ET_MOUSE_RELEASED, 0, 0, ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent synthetic_event(ui::ET_MOUSE_RELEASED,
+                                 gfx::Point(),
+                                 gfx::Point(),
+                                 ui::EF_LEFT_MOUSE_BUTTON);
   NotifyClick(synthetic_event);
   return true;
 }
 
 void CustomButton::ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture) {
   if (!context_menu_controller())
     return;
 
   // We're about to show the context menu. Showing the context menu likely means
   // we won't get a mouse exited and reset state. Reset it now to be sure.
@@ skipping 68 matching lines @@
   if (!is_add && state_ != BS_DISABLED)
     SetState(BS_NORMAL);
 }
 
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(BS_NORMAL);
 }
 
 }  // namespace views