Remove GestureEvent interface, and rename GestureEventImpl to GestureEvent.

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 192 matching lines @@
   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_) {
   }
 
   TouchEvent(EventType type,
-                 const gfx::Point& root_location,
-                 int touch_id,
-                 base::TimeDelta time_stamp);
+             const gfx::Point& root_location,
+             int touch_id,
+             base::TimeDelta time_stamp);
 
   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.
@@ skipping 139 matching lines @@
   float x_offset() const { return x_offset_; }
   float y_offset() const { return y_offset_; }
 
  private:
   float x_offset_;
   float y_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(ScrollEvent);
 };
 
-// TODO(beng): rename to GestureEvent after conversion is complete.
-class UI_EXPORT GestureEventImpl : public LocatedEvent,
-                                   public GestureEvent {
+class UI_EXPORT GestureEvent : public LocatedEvent {
  public:
-  GestureEventImpl(EventType type,
-                   int x,
-                   int y,
-                   int flags,
-                   base::Time time_stamp,
-                   const GestureEventDetails& details,
-                   unsigned int touch_ids_bitfield);
+  GestureEvent(EventType type,
+               int x,
+               int y,
+               int flags,
+               base::Time time_stamp,
+               const GestureEventDetails& details,
+               unsigned int touch_ids_bitfield);
 
-  // Create a new GestureEventImpl which is identical to the provided model.
+  // Create a new GestureEvent 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 <typename T>
-  GestureEventImpl(const GestureEventImpl& model, T* source, T* target)
+  GestureEvent(const GestureEvent& model, T* source, T* target)
       : LocatedEvent(model, source, target),
         details_(model.details_),
         touch_ids_bitfield_(model.touch_ids_bitfield_) {
   }
 
-  virtual ~GestureEventImpl();
+  virtual ~GestureEvent();
 
   const GestureEventDetails& details() const { return details_; }
 
   // Returns the lowest touch-id of any of the touches which make up this
-  // gesture.
-  // If there are no touches associated with this gesture, returns -1.
-  virtual int GetLowestTouchId() const OVERRIDE;
+  // gesture. If there are no touches associated with this gesture, returns -1.
+  int GetLowestTouchId() const;
 
  private:
   GestureEventDetails details_;
 
   // The set of indices of ones in the binary representation of
   // touch_ids_bitfield_ is the set of touch_ids associate with this gesture.
   // 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);
+  DISALLOW_COPY_AND_ASSIGN(GestureEvent);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_EVENT_H_