Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

ui/views/events/event.h

Index: ui/views/events/event.h
diff --git a/ui/views/events/event.h b/ui/views/events/event.h
index ea5d319d3b60021d5c97aae5194ee8e863fbb78c..fa910cd5f84ee1f00034bd1555d943c9e8fbbb24 100644
--- a/ui/views/events/event.h
+++ b/ui/views/events/event.h
@@ -219,8 +219,7 @@ class VIEWS_EXPORT MouseEvent : public LocatedEvent {
 // 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);
 
@@ -249,17 +248,6 @@ class VIEWS_EXPORT TouchEvent : public LocatedEvent,
   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;
 
@@ -377,8 +365,7 @@ class VIEWS_EXPORT ScrollEvent : public MouseEvent {
 // GestureEvent class
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_EXPORT GestureEvent : public LocatedEvent,
-                                  public ui::GestureEvent {
+class VIEWS_EXPORT GestureEvent : public LocatedEvent {
  public:
   explicit GestureEvent(const NativeEvent& native_event);
 
@@ -399,9 +386,6 @@ class VIEWS_EXPORT GestureEvent : public LocatedEvent,
 
   GestureEvent(const GestureEvent& model, View* root);
 
-  // Overridden from ui::GestureEvent.
-  virtual int GetLowestTouchId() const OVERRIDE;
-
   ui::GestureEventDetails details_;
 
   DISALLOW_COPY_AND_ASSIGN(GestureEvent);