Convert Aura to use ui::Event.

ui/aura/root_window.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_ROOT_WINDOW_H_
 #define UI_AURA_ROOT_WINDOW_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 13 matching lines @@
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace ui {
+class GestureEventImpl;
 class GestureRecognizer;
+class KeyEvent;
 class LayerAnimationSequence;
+class MouseEvent;
+class ScrollEvent;
+class TouchEventImpl;
 class Transform;
 }
 
 namespace aura {
 
 class FocusManager;
-class GestureEvent;
-class KeyEvent;
-class MouseEvent;
 class RootWindow;
 class RootWindowHost;
 class RootWindowObserver;
-class ScrollEvent;
-class TouchEvent;
 
 // This class represents a lock on the compositor, that can be used to prevent a
 // compositing pass from happening while we're waiting for an asynchronous
 // event. The typical use case is when waiting for a renderer to produce a frame
 // at the right size. The caller keeps a reference on this object, and drops the
 // reference once it desires to release the lock.
 // Note however that the lock is canceled after a short timeout to ensure
 // responsiveness of the UI, so the compositor tree should be kept in a
 // "reasonable" state while the lock is held.
 // Don't instantiate this class directly, use RootWindow::GetCompositorLock.
@@ skipping 78 matching lines @@
 
   // Draws the necessary set of windows.
   void Draw();
 
   // Draw the whole screen.
   void ScheduleFullDraw();
 
   // Handles a gesture event. Returns true if handled. Unlike the other
   // event-dispatching function (e.g. for touch/mouse/keyboard events), gesture
   // events are dispatched from GestureRecognizer instead of RootWindowHost.
-  bool DispatchGestureEvent(GestureEvent* event);
+  bool DispatchGestureEvent(ui::GestureEventImpl* event);
 
   // Invoked when |window| is being destroyed.
   void OnWindowDestroying(Window* window);
 
   // Invoked when |window|'s bounds have changed. |contained_mouse| indicates if
   // the bounds before change contained the |last_moust_location()|.
   void OnWindowBoundsChanged(Window* window, bool contained_mouse);
 
   // Invoked when |window|'s visibility is changed.
   void OnWindowVisibilityChanged(Window* window, bool is_visible);
@@ skipping 101 matching lines @@
 
   // Exposes RootWindowHost::QueryMouseLocation() for test purposes.
   gfx::Point QueryMouseLocationForTest() const;
 
  private:
   friend class Window;
   friend class CompositorLock;
 
   // Called whenever the mouse moves, tracks the current |mouse_moved_handler_|,
   // sending exited and entered events as its value changes.
-  void HandleMouseMoved(const MouseEvent& event, Window* target);
+  void HandleMouseMoved(const ui::MouseEvent& event, Window* target);
 
-  bool ProcessMouseEvent(Window* target, MouseEvent* event);
-  bool ProcessKeyEvent(Window* target, KeyEvent* event);
-  ui::TouchStatus ProcessTouchEvent(Window* target, TouchEvent* event);
-  ui::GestureStatus ProcessGestureEvent(Window* target, GestureEvent* event);
+  bool ProcessMouseEvent(Window* target, ui::MouseEvent* event);
+  bool ProcessKeyEvent(Window* target, ui::KeyEvent* event);
+  ui::TouchStatus ProcessTouchEvent(Window* target, ui::TouchEventImpl* event);
+  ui::GestureStatus ProcessGestureEvent(Window* target,
+                                        ui::GestureEventImpl* event);
   bool ProcessGestures(ui::GestureRecognizer::Gestures* gestures);
 
   // Called when a Window is attached or detached from the RootWindow.
   void OnWindowAddedToRootWindow(Window* window);
   void OnWindowRemovedFromRootWindow(Window* window);
 
   // Called when a window becomes invisible, either by being removed
   // from root window hierachy, via SetVisible(false) or being destroyed.
   // |destroyed| is set to true when the window is being destroyed.
   void OnWindowHidden(Window* invisible, bool destroyed);
@@ skipping 17 matching lines @@
 
   // Overridden from ui::LayerAnimationObserver:
   virtual void OnLayerAnimationEnded(
       ui::LayerAnimationSequence* animation) OVERRIDE;
   virtual void OnLayerAnimationScheduled(
       ui::LayerAnimationSequence* animation) OVERRIDE;
   virtual void OnLayerAnimationAborted(
       ui::LayerAnimationSequence* animation) OVERRIDE;
 
   // Overridden from aura::RootWindowHostDelegate:
-  virtual bool OnHostKeyEvent(KeyEvent* event) OVERRIDE;
-  virtual bool OnHostMouseEvent(MouseEvent* event) OVERRIDE;
-  virtual bool OnHostScrollEvent(ScrollEvent* event) OVERRIDE;
-  virtual bool OnHostTouchEvent(TouchEvent* event) OVERRIDE;
+  virtual bool OnHostKeyEvent(ui::KeyEvent* event) OVERRIDE;
+  virtual bool OnHostMouseEvent(ui::MouseEvent* event) OVERRIDE;
+  virtual bool OnHostScrollEvent(ui::ScrollEvent* event) OVERRIDE;
+  virtual bool OnHostTouchEvent(ui::TouchEventImpl* event) OVERRIDE;
   virtual void OnHostLostCapture() OVERRIDE;
   virtual void OnHostPaint() OVERRIDE;
   virtual void OnHostResized(const gfx::Size& size) OVERRIDE;
   virtual float GetDeviceScaleFactor() OVERRIDE;
   virtual RootWindow* AsRootWindow() OVERRIDE;
 
   // We hold and aggregate mouse drags as a way of throttling resizes when
   // HoldMouseMoves() is called. The following methods are used to dispatch held
   // and newly incoming mouse events, typically when an event other than a mouse
   // drag needs dispatching or a matching ReleaseMouseMoves() is called.
   // NOTE: because these methods dispatch events from RootWindowHost the
   // coordinates are in terms of the root.
-  bool DispatchMouseEventImpl(MouseEvent* event);
-  bool DispatchMouseEventToTarget(MouseEvent* event, Window* target);
+  bool DispatchMouseEventImpl(ui::MouseEvent* event);
+  bool DispatchMouseEventToTarget(ui::MouseEvent* event, Window* target);
   void DispatchHeldMouseMove();
 
   // Parses the switch describing the initial size for the host window and
   // returns bounds for the window.
   gfx::Rect GetInitialHostWindowBounds() const;
 
   // Posts a task to send synthesized mouse move event if there
   // is no a pending task.
   void PostMouseMoveEventAfterWindowChange();
 
@@ skipping 42 matching lines @@
 
   bool synthesize_mouse_move_;
   bool waiting_on_compositing_end_;
   bool draw_on_compositing_end_;
 
   bool defer_draw_scheduling_;
 
   // How many holds are outstanding. We try to defer dispatching mouse moves
   // while the count is > 0.
   int mouse_move_hold_count_;
-  scoped_ptr<MouseEvent> held_mouse_move_;
+  scoped_ptr<ui::MouseEvent> held_mouse_move_;
   // Used to schedule DispatchHeldMouseMove() when |mouse_move_hold_count_| goes
   // to 0.
   base::WeakPtrFactory<RootWindow> held_mouse_event_factory_;
 
   CompositorLock* compositor_lock_;
   bool draw_on_compositor_unlock_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindow);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ROOT_WINDOW_H_