views: Remove dependency on ui::TouchEvent/GestureEvent from views.

BUG=125937

Review URL: https://chromiumcodereview.appspot.com/10829262

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150915 0039d316-1c4b-4281-b951-d872f2087c98

ui/views/events/event.cc

@@ -123,42 +123,6 @@ TouchEvent::TouchEvent(const TouchEvent& model, View* source, View* target)
 TouchEvent::~TouchEvent() {
 }
 
-ui::EventType TouchEvent::GetEventType() const {
-  return type();
-}
-
-gfx::Point TouchEvent::GetLocation() const {
-  return location();
-}
-
-int TouchEvent::GetTouchId() const {
-  return touch_id_;
-}
-
-int TouchEvent::GetEventFlags() const {
-  return flags();
-}
-
-base::TimeDelta TouchEvent::GetTimestamp() const {
-  return base::TimeDelta::FromMilliseconds(time_stamp().ToDoubleT() * 1000);
-}
-
-float TouchEvent::RadiusX() const {
-  return radius_x_;
-}
-
-float TouchEvent::RadiusY() const {
-  return radius_y_;
-}
-
-float TouchEvent::RotationAngle() const {
-  return rotation_angle_;
-}
-
-float TouchEvent::Force() const {
-  return force_;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent, private:
 
@@ -208,13 +172,6 @@ GestureEvent::GestureEvent(ui::EventType type, int x, int y, int flags)
 GestureEvent::~GestureEvent() {
 }
 
-#if !defined(USE_AURA)
-int GestureEvent::GetLowestTouchId() const {
-  // TODO:
-  return 0;
-}
-#endif
-
 GestureEventForTest::GestureEventForTest(ui::EventType type,
                                          int x,
                                          int y,

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);

ui/views/events/event_aura.cc

@@ -56,9 +56,4 @@ GestureEvent::GestureEvent(const NativeEvent& event)
       details_(static_cast<ui::GestureEventImpl*>(event)->details()) {
 }
 
-int GestureEvent::GetLowestTouchId() const {
-  return native_event() ?  static_cast<ui::GestureEventImpl*>(
-      native_event())->GetLowestTouchId() : 0;
-}
-
 }  // namespace views