Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

ui/base/event.cc

 // 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.
 
 #include "ui/base/event.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
@@ skipping 206 matching lines @@
       f &= ~EF_IS_DOUBLE_CLICK;
       f |= EF_IS_TRIPLE_CLICK;
       break;
   }
   set_flags(f);
 }
 
 MouseEvent::MouseEvent(const MouseEvent& model) : LocatedEvent(model) {
 }
 
-TouchEventImpl::TouchEventImpl(const base::NativeEvent& native_event)
+TouchEvent::TouchEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event),
       touch_id_(ui::GetTouchId(native_event)),
       radius_x_(GetTouchRadiusX(native_event)),
       radius_y_(GetTouchRadiusY(native_event)),
       rotation_angle_(GetTouchAngle(native_event)),
       force_(GetTouchForce(native_event)) {
 }
 
-TouchEventImpl::TouchEventImpl(EventType type,
+TouchEvent::TouchEvent(EventType type,
                                const gfx::Point& location,
                                int touch_id,
                                base::TimeDelta time_stamp)
     : LocatedEvent(type, location, location, 0),
       touch_id_(touch_id),
       radius_x_(0.0f),
       radius_y_(0.0f),
       rotation_angle_(0.0f),
       force_(0.0f) {
   set_time_stamp(time_stamp);
 }
 
-TouchEventImpl::~TouchEventImpl() {
+TouchEvent::~TouchEvent() {
 }
 
-void TouchEventImpl::UpdateForRootTransform(const Transform& root_transform) {
+void TouchEvent::UpdateForRootTransform(const Transform& root_transform) {
   LocatedEvent::UpdateForRootTransform(root_transform);
   gfx::Point3f scale;
   InterpolatedTransform::FactorTRS(root_transform, NULL, NULL, &scale);
   if (scale.x())
     radius_x_ /= scale.x();
   if (scale.y())
     radius_y_ /= scale.y();
 }
 
-EventType TouchEventImpl::GetEventType() const {
-  return type();
-}
-
-gfx::Point TouchEventImpl::GetLocation() const {
-  return location();
-}
-
-int TouchEventImpl::GetTouchId() const {
-  return touch_id_;
-}
-
-int TouchEventImpl::GetEventFlags() const {
-  return flags();
-}
-
-base::TimeDelta TouchEventImpl::GetTimestamp() const {
-  return time_stamp();
-}
-
-float TouchEventImpl::RadiusX() const {
-  return radius_x_;
-}
-
-float TouchEventImpl::RadiusY() const {
-  return radius_y_;
-}
-
-float TouchEventImpl::RotationAngle() const {
-  return rotation_angle_;
-}
-
-float TouchEventImpl::Force() const {
-  return force_;
-}
-
 KeyEvent::KeyEvent(const base::NativeEvent& native_event, bool is_char)
     : Event(native_event,
             EventTypeFromNative(native_event),
             EventFlagsFromNative(native_event)),
       key_code_(KeyboardCodeFromNative(native_event)),
       is_char_(is_char),
       character_(0),
       unmodified_character_(0) {
 }
 
@@ skipping 120 matching lines @@
 int GestureEventImpl::GetLowestTouchId() const {
   if (touch_ids_bitfield_ == 0)
     return -1;
   int i = -1;
   // Find the index of the least significant 1 bit
   while (!(1 << ++i & touch_ids_bitfield_));
   return i;
 }
 
 }  // namespace ui