Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

ui/base/gestures/gesture_types.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_BASE_GESTURES_GESTURE_TYPES_H_
 #define UI_BASE_GESTURES_GESTURE_TYPES_H_
 
 #include "base/logging.h"
 #include "base/time.h"
 #include "ui/base/events.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
 
+class TouchEvent;
+
 struct UI_EXPORT GestureEventDetails {
  public:
   GestureEventDetails(EventType type, float delta_x, float delta_y);
 
   EventType type() const { return type_; }
 
   int touch_points() const { return touch_points_; }
   void set_touch_points(int touch_points) { touch_points_ = touch_points; }
 
   const gfx::Rect& bounding_box() const { return bounding_box_; }
@@ skipping 81 matching lines @@
     } generic;
   } data;
 
   int touch_points_;  // Number of active touch points in the gesture.
 
   // Bounding box is an axis-aligned rectangle that contains all the
   // enclosing rectangles of the touch-points in the gesture.
   gfx::Rect bounding_box_;
 };
 
-// An abstract type to represent touch-events. The gesture-recognizer uses this
-// interface to communicate with the touch-events.
-class UI_EXPORT TouchEvent {
- public:
-  virtual ~TouchEvent() {}
-
-  virtual EventType GetEventType() const = 0;
-  virtual gfx::Point GetLocation() const = 0;
-  virtual int GetTouchId() const = 0;
-  virtual int GetEventFlags() const = 0;
-  virtual base::TimeDelta GetTimestamp() const = 0;
-  virtual float RadiusX() const = 0;
-  virtual float RadiusY() const = 0;
-  virtual float RotationAngle() const = 0;
-  virtual float Force() const = 0;
-};
-
 // An abstract type to represent gesture-events.
 class UI_EXPORT GestureEvent {
  public:
   virtual ~GestureEvent() {}
 
   // A gesture event can have multiple touches. This function should return the
   // lowest ID of the touches in this gesture.
   virtual int GetLowestTouchId() const = 0;
 
   // A helper function used in several (all) derived classes.
@@ skipping 37 matching lines @@
 
   // |flags| is ui::EventFlags. The meaning of |param_first| and |param_second|
   // depends on the specific gesture type (|type|).
   virtual GestureEvent* CreateGestureEvent(const GestureEventDetails& details,
                                            const gfx::Point& location,
                                            int flags,
                                            base::Time time,
                                            unsigned int touch_id_bitfield) = 0;
 
   virtual TouchEvent* CreateTouchEvent(EventType type,
-                                       const gfx::Point& location,
-                                       int touch_id,
-                                       base::TimeDelta time_stamp) = 0;
+                                           const gfx::Point& location,
+                                           int touch_id,
+                                           base::TimeDelta time_stamp) = 0;
 
   virtual bool DispatchLongPressGestureEvent(GestureEvent* event) = 0;
   virtual bool DispatchCancelTouchEvent(TouchEvent* event) = 0;
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_GESTURES_GESTURE_TYPES_H_