Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

ui/base/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_BASE_EVENT_H_
 #define UI_BASE_EVENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/event_types.h"
@@ skipping 174 matching lines @@
   explicit MouseEvent(const MouseEvent& model);
 
   gfx::Point root_location_;
 
   static MouseEvent* last_click_event_;
   // Returns the repeat count based on the previous mouse click, if it is
   // recent enough and within a small enough distance.
   static int GetRepeatCount(const MouseEvent& click_event);
 };
 
-// TODO(beng): rename to TouchEvent after conversion is complete.
-class UI_EXPORT TouchEventImpl : public LocatedEvent,
-                                 public TouchEvent {
+class UI_EXPORT TouchEvent : public LocatedEvent {
  public:
-  explicit TouchEventImpl(const base::NativeEvent& native_event);
+  explicit TouchEvent(const base::NativeEvent& native_event);
 
-  // Create a new TouchEventImpl which is identical to the provided model.
+  // Create a new TouchEvent which is identical to the provided model.
   // If source / target windows are provided, the model location will be
   // converted from |source| coordinate system to |target| coordinate system.
   template <class T>
-  TouchEventImpl(const TouchEventImpl& model, T* source, T* target)
+  TouchEvent(const TouchEvent& model, T* source, T* target)
       : LocatedEvent(model, source, target),
         touch_id_(model.touch_id_),
         radius_x_(model.radius_x_),
         radius_y_(model.radius_y_),
         rotation_angle_(model.rotation_angle_),
         force_(model.force_) {
   }
 
-  TouchEventImpl(EventType type,
+  TouchEvent(EventType type,
                  const gfx::Point& root_location,
                  int touch_id,
                  base::TimeDelta time_stamp);
 
-  virtual ~TouchEventImpl();
+  virtual ~TouchEvent();
 
   int touch_id() 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_; }
 
   // Used for unit tests.
   void set_radius_x(const float r) { radius_x_ = r; }
   void set_radius_y(const float r) { radius_y_ = r; }
 
   // Overridden from LocatedEvent.
   virtual void UpdateForRootTransform(const Transform& root_transform) OVERRIDE;
 
-  // Overridden from TouchEvent.
-  virtual 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;
+ protected:
+  void set_radius(float radius_x, float radius_y) {
+    radius_x_ = radius_x;
+    radius_y_ = radius_y;
+  }
+
+  void set_rotation_angle(float rotation_angle) {
+    rotation_angle_ = rotation_angle;
+  }
+
+  void set_force(float force) { force_ = force; }
+
+ protected:
+  void set_radius(float radius_x, float radius_y) {
+    radius_x_ = radius_x;
+    radius_y_ = radius_y;
+  }
+
+  void set_rotation_angle(float rotation_angle) {
+    rotation_angle_ = rotation_angle;
+  }
+
+  void set_force(float force) { force_ = force; }
 
  private:
   // 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. 0.0 if unknown.
   float radius_x_;
 
   // Radius of the Y (minor) axis of the touch ellipse. 0.0 if unknown.
   float radius_y_;
 
   // Angle of the major axis away from the X axis. Default 0.0.
-  const float rotation_angle_;
+  float rotation_angle_;
 
   // Force (pressure) of the touch. Normalized to be [0, 1]. Default to be 0.0.
-  const float force_;
+  float force_;
 
-  DISALLOW_COPY_AND_ASSIGN(TouchEventImpl);
+  DISALLOW_COPY_AND_ASSIGN(TouchEvent);
 };
 
 class UI_EXPORT KeyEvent : public Event {
  public:
   KeyEvent(const base::NativeEvent& native_event, bool is_char);
 
   // Used for synthetic events in testing.
   KeyEvent(EventType type, KeyboardCode key_code, int flags);
 
   // These setters allow an I18N virtual keyboard to fabricate a keyboard event
@@ skipping 139 matching lines @@
   // This value is stored as a bitfield because the number of touch ids varies,
   // but we currently don't need more than 32 touches at a time.
   const unsigned int touch_ids_bitfield_;
 
   DISALLOW_COPY_AND_ASSIGN(GestureEventImpl);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_EVENT_H_