Replace views::LocatedEvent with ui::LocatedEvent

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;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// LocatedEvent class
-//
-// A generic event that is used for any events that is located at a specific
-// position in the screen.
-//
-////////////////////////////////////////////////////////////////////////////////
-class VIEWS_EXPORT LocatedEvent : public ui::Event {
- public:
-  int x() const { return location_.x(); }
-  int y() const { return location_.y(); }
-  const gfx::Point& location() const { return location_; }
-
- protected:
-  explicit LocatedEvent(const ui::NativeEvent& native_event);
-
-  // TODO(msw): Kill this legacy constructor when we update uses.
-  // Simple initialization from cracked metadata.
-  LocatedEvent(ui::EventType type, const gfx::Point& location, int flags);
-
-  // Create a new LocatedEvent 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.
-  LocatedEvent(const LocatedEvent& model, View* source, View* target);
-
-  // This constructor is to allow converting the location of an event from the
-  // widget's coordinate system to the RootView's coordinate system.
-  LocatedEvent(const LocatedEvent& model, View* root);
-
-  gfx::Point location_;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//
 // MouseEvent class
 //
 // A mouse event is used for any input event related to the mouse.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_EXPORT MouseEvent : public LocatedEvent {
+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), 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;
   }
-
- protected:
-  MouseEvent(const MouseEvent& model, View* root)
-      : LocatedEvent(model, root) {
-  }
-
- private:
-  friend class internal::RootView;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // 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 LocatedEvent {
+class VIEWS_EXPORT TouchEvent : public ui::LocatedEvent {
  public:
   explicit TouchEvent(const ui::NativeEvent& native_event);
 
   // Create a new touch event.
   TouchEvent(ui::EventType type,
              int x,
              int y,
              int flags,
              int touch_id,
              float radius_x,
              float radius_y,
              float angle,
              float force);
 
   // Create a new TouchEvent 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.
   TouchEvent(const TouchEvent& model, View* source, View* target);
 
   virtual ~TouchEvent();
 
   int identity() const { return touch_id_; }
 
   float radius_x() const { return radius_x_; }
   float radius_y() const { return radius_y_; }
   float rotation_angle() const { return rotation_angle_; }
   float force() const { return force_; }
 
  private:
-  friend class internal::RootView;
-
-  TouchEvent(const TouchEvent& model, View* root);
-
   // The identity (typically finger) of the touch starting at 0 and incrementing
   // for each separable additional touch that the hardware can detect.
   const int touch_id_;
 
   // Radius of the X (major) axis of the touch ellipse. 1.0 if unknown.
   const float radius_x_;
 
   // Radius of the Y (minor) axis of the touch ellipse. 1.0 if unknown.
   const float radius_y_;
 
@@ skipping 21 matching lines @@
   // 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_; }
 
  private:
-  friend class internal::RootView;
-
-  MouseWheelEvent(const MouseWheelEvent& model, View* root)
-      : MouseEvent(model, root),
-        offset_(model.offset_) {
-  }
-
   int offset_;
 
   DISALLOW_COPY_AND_ASSIGN(MouseWheelEvent);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // DropTargetEvent class
 //
 // A DropTargetEvent is sent to the view the mouse is over during a drag and
 // drop operation.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_EXPORT DropTargetEvent : public LocatedEvent {
+class VIEWS_EXPORT DropTargetEvent : public ui::LocatedEvent {
  public:
   DropTargetEvent(const ui::OSExchangeData& data,
                   int x,
                   int y,
                   int source_operations)
-      : LocatedEvent(ui::ET_DROP_TARGET_EVENT, gfx::Point(x, y), 0),
+      : LocatedEvent(
+            ui::ET_DROP_TARGET_EVENT, gfx::Point(x, y), gfx::Point(x, y), 0),
         data_(data),
         source_operations_(source_operations) {
     // TODO(msw): Hook up key state flags for CTRL + drag and drop, etc.
   }
 
   const ui::OSExchangeData& data() const { return data_; }
   int source_operations() const { return source_operations_; }
 
  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 {
  public:
   explicit ScrollEvent(const ui::NativeEvent& native_event);
 
   float x_offset() const { return x_offset_; }
   float y_offset() const { return y_offset_; }
 
  private:
-  friend class internal::RootView;
-
-  ScrollEvent(const ScrollEvent& model, View* root)
-      : MouseEvent(model, root),
-        x_offset_(model.x_offset()),
-        y_offset_(model.y_offset()) {
-  }
-
   float x_offset_;
   float y_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(ScrollEvent);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // GestureEvent class
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_EXPORT GestureEvent : public LocatedEvent {
+class VIEWS_EXPORT GestureEvent : public ui::LocatedEvent {
  public:
   explicit GestureEvent(const ui::NativeEvent& native_event);
 
   // Create a new GestureEvent 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.
   GestureEvent(const GestureEvent& model, View* source, View* target);
 
   virtual ~GestureEvent();
 
   const ui::GestureEventDetails& details() const { return details_; }
 
  protected:
   GestureEvent(ui::EventType type, int x, int y, int flags);
 
  private:
-  friend class internal::RootView;
-
-  GestureEvent(const GestureEvent& model, View* root);
-
   ui::GestureEventDetails details_;
 
   DISALLOW_COPY_AND_ASSIGN(GestureEvent);
 };
 
 class VIEWS_EXPORT GestureEventForTest : public GestureEvent {
  public:
   GestureEventForTest(ui::EventType type, int x, int y, int flags);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GestureEventForTest);
 };
 
 #if defined(OS_WIN)
 int GetModifiersFromKeyState();
 #endif
 
 }  // namespace views
 
 #endif  // UI_VIEWS_EVENTS_EVENT_H_