Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

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 201 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // 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,
-                                public ui::TouchEvent {
+class VIEWS_EXPORT TouchEvent : public LocatedEvent {
  public:
   explicit TouchEvent(const 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_; }
 
-  // Overridden from ui::TouchEvent.
-  virtual ui::EventType GetEventType() const OVERRIDE;
-  virtual gfx::Point GetLocation() const OVERRIDE;
-  virtual int GetTouchId() const OVERRIDE;
-  virtual int GetEventFlags() const OVERRIDE;
-  virtual base::TimeDelta GetTimestamp() const OVERRIDE;
-  virtual float RadiusX() const OVERRIDE;
-  virtual float RadiusY() const OVERRIDE;
-  virtual float RotationAngle() const OVERRIDE;
-  virtual float Force() const OVERRIDE;
-
  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.
@@ skipping 97 matching lines @@
   float x_offset_;
   float y_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(ScrollEvent);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // GestureEvent class
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_EXPORT GestureEvent : public LocatedEvent,
-                                  public ui::GestureEvent {
+class VIEWS_EXPORT GestureEvent : public LocatedEvent {
  public:
   explicit GestureEvent(const 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);
 
-  // Overridden from ui::GestureEvent.
-  virtual int GetLowestTouchId() const OVERRIDE;
-
   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_