Replace views::MouseEvent with ui::MouseEvent

ui/views/events/event.h

 
 // 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.
 
 #ifndef UI_VIEWS_EVENTS_EVENT_H_
 #define UI_VIEWS_EVENTS_EVENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 15 matching lines @@
 namespace views {
 
 class View;
 
 namespace internal {
 class RootView;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// MouseEvent class
-//
-// A mouse event is used for any input event related to the mouse.
-//
-////////////////////////////////////////////////////////////////////////////////
-class VIEWS_EXPORT MouseEvent : public ui::LocatedEvent {
- public:
-  explicit MouseEvent(const ui::NativeEvent& native_event);
-  // Create a new MouseEvent which is identical to the provided model.
-  // If source / target views are provided, the model location will be converted
-  // from |source| coordinate system to |target| coordinate system.
-  MouseEvent(const MouseEvent& model, View* source, View* target);
-
-  // TODO(msw): Kill this legacy constructor when we update uses.
-  // Create a new mouse event
-  MouseEvent(ui::EventType type, int x, int y, int flags)
-      : LocatedEvent(type, gfx::Point(x, y), gfx::Point(x, y), flags) {
-  }
-
-  // Conveniences to quickly test what button is down
-  bool IsOnlyLeftMouseButton() const {
-    return (flags() & ui::EF_LEFT_MOUSE_BUTTON) &&
-      !(flags() & (ui::EF_MIDDLE_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON));
-  }
-
-  bool IsLeftMouseButton() const {
-    return (flags() & ui::EF_LEFT_MOUSE_BUTTON) != 0;
-  }
-
-  bool IsOnlyMiddleMouseButton() const {
-    return (flags() & ui::EF_MIDDLE_MOUSE_BUTTON) &&
-      !(flags() & (ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON));
-  }
-
-  bool IsMiddleMouseButton() const {
-    return (flags() & ui::EF_MIDDLE_MOUSE_BUTTON) != 0;
-  }
-
-  bool IsOnlyRightMouseButton() const {
-    return (flags() & ui::EF_RIGHT_MOUSE_BUTTON) &&
-      !(flags() & (ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON));
-  }
-
-  bool IsRightMouseButton() const {
-    return (flags() & ui::EF_RIGHT_MOUSE_BUTTON) != 0;
-  }
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//
 // TouchEvent class
 //
 // A touch event is generated by touch screen and advanced track
 // pad devices. There is a deliberate direct correspondence between
 // TouchEvent and PlatformTouchPoint.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT TouchEvent : public ui::LocatedEvent {
  public:
   explicit TouchEvent(const ui::NativeEvent& native_event);
@@ skipping 46 matching lines @@
 class ScrollEvent;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MouseWheelEvent class
 //
 // A MouseWheelEvent is used to propagate mouse wheel user events.
 // Note: e.GetOffset() > 0 means scroll up / left.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_EXPORT MouseWheelEvent : public MouseEvent {
+class VIEWS_EXPORT MouseWheelEvent : public ui::MouseEvent {
  public:
   // See |offset| for details.
   static const int kWheelDelta;
 
   explicit MouseWheelEvent(const ui::NativeEvent& native_event);
   explicit MouseWheelEvent(const ScrollEvent& scroll_event);
 
   // The amount to scroll. This is in multiples of kWheelDelta.
   int offset() const { return offset_; }
 
@@ skipping 30 matching lines @@
  private:
   // Data associated with the drag/drop session.
   const ui::OSExchangeData& data_;
 
   // Bitmask of supported ui::DragDropTypes::DragOperation by the source.
   int source_operations_;
 
   DISALLOW_COPY_AND_ASSIGN(DropTargetEvent);
 };
 
-class VIEWS_EXPORT ScrollEvent : public MouseEvent {
+class VIEWS_EXPORT ScrollEvent : public ui::MouseEvent {
  public:
   explicit ScrollEvent(const ui::NativeEvent& native_event);
 
   float x_offset() const { return x_offset_; }
   float y_offset() const { return y_offset_; }
 
  private:
   float x_offset_;
   float y_offset_;
 
@@ skipping 34 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(GestureEventForTest);
 };
 
 #if defined(OS_WIN)
 int GetModifiersFromKeyState();
 #endif
 
 }  // namespace views
 
 #endif  // UI_VIEWS_EVENTS_EVENT_H_