Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

ash/wm/user_activity_detector.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 ASH_WM_USER_ACTIVITY_DETECTOR_H_
 #define ASH_WM_USER_ACTIVITY_DETECTOR_H_
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 22 matching lines @@
 
   // aura::EventFilter implementation.
   virtual bool PreHandleKeyEvent(
       aura::Window* target,
       ui::KeyEvent* event) OVERRIDE;
   virtual bool PreHandleMouseEvent(
       aura::Window* target,
       ui::MouseEvent* event) OVERRIDE;
   virtual ui::TouchStatus PreHandleTouchEvent(
       aura::Window* target,
-      ui::TouchEventImpl* event) OVERRIDE;
+      ui::TouchEvent* event) OVERRIDE;
   virtual ui::GestureStatus PreHandleGestureEvent(
       aura::Window* target,
       ui::GestureEventImpl* event) OVERRIDE;
 
  private:
   // Notifies observers if enough time has passed since the last notification.
   void MaybeNotify();
 
   ObserverList<UserActivityObserver> observers_;
 
   // Last time at which we notified observers that the user was active.
   base::TimeTicks last_observer_notification_time_;
 
   // If set, used when the current time is needed.  This can be set by tests to
   // simulate the passage of time.
   base::TimeTicks now_for_test_;
 
   DISALLOW_COPY_AND_ASSIGN(UserActivityDetector);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_USER_ACTIVITY_DETECTOR_H_