Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

ui/aura/window_delegate.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_AURA_WINDOW_DELEGATE_H_
 #define UI_AURA_WINDOW_DELEGATE_H_
 
 #include "ui/aura/aura_export.h"
 #include "ui/base/events.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Canvas;
 class Path;
 class Point;
 class Rect;
 class Size;
 }
 
 namespace ui {
 class GestureEventImpl;
 class KeyEvent;
 class MouseEvent;
-class TouchEventImpl;
+class TouchEvent;
 }
 
 namespace aura {
 
 // Delegate interface for aura::Window.
 class AURA_EXPORT WindowDelegate {
  public:
   // Returns the window's minimum size, or size 0,0 if there is no limit.
   virtual gfx::Size GetMinimumSize() const = 0;
 
@@ skipping 16 matching lines @@
   virtual int GetNonClientComponent(const gfx::Point& point) const = 0;
 
   // Returns true if event handling should descend into |child|. |location| is
   // in terms of the Window.
   virtual bool ShouldDescendIntoChildForEventHandling(
       Window* child,
       const gfx::Point& location) = 0;
 
   virtual bool OnMouseEvent(ui::MouseEvent* event) = 0;
 
-  virtual ui::TouchStatus OnTouchEvent(ui::TouchEventImpl* event) = 0;
+  virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) = 0;
 
   virtual ui::GestureStatus OnGestureEvent(ui::GestureEventImpl* event) = 0;
 
   // Returns true of the window can be focused.
   virtual bool CanFocus() = 0;
 
   // Invoked when mouse capture is lost on the window.
   virtual void OnCaptureLost() = 0;
 
   // Asks the delegate to paint window contents into the supplied canvas.
@@ skipping 28 matching lines @@
   // above returns true.
   virtual void GetHitTestMask(gfx::Path* mask) const = 0;
 
  protected:
   virtual ~WindowDelegate() {}
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_DELEGATE_H_