Convert Aura to use ui::Event.

http://crbug.com/125937
TEST=existing
Review URL: https://chromiumcodereview.appspot.com/10827145

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150587 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 28 insertions, 13 deletions

diff --git a/ui/aura/client/activation_client.h b/ui/aura/client/activation_client.h
index 59841b3..23656e6 100644
--- a/ui/aura/client/activation_client.h
+++ b/ui/aura/client/activation_client.h
@@ -8,8 +8,11 @@
 #include "ui/aura/aura_export.h"
 #include "ui/aura/window.h"
 
-namespace aura {
+namespace ui {
 class Event;
+}
+
+namespace aura {
 class RootWindow;
 
 namespace client {
@@ -30,11 +33,11 @@ class AURA_EXPORT ActivationClient {
   virtual void DeactivateWindow(Window* window) = 0;
 
   // Retrieves the active window, or NULL if there is none.
-  virtual aura::Window* GetActiveWindow() = 0;
+  virtual Window* GetActiveWindow() = 0;
 
   // Invoked prior to |window| getting focus as a result of the |event|. |event|
   // may be NULL. Returning false blocks |window| from getting focus.
-  virtual bool OnWillFocusWindow(Window* window, const Event* event) = 0;
+  virtual bool OnWillFocusWindow(Window* window, const ui::Event* event) = 0;
 
   // Returns true if |window| can be activated, false otherwise. If |window| has
   // a modal child it can not be activated.
diff --git a/ui/aura/client/activation_delegate.h b/ui/aura/client/activation_delegate.h
index 8551f85..ddb8069 100644
--- a/ui/aura/client/activation_delegate.h
+++ b/ui/aura/client/activation_delegate.h
@@ -7,8 +7,11 @@
 
 #include "ui/aura/aura_export.h"
 
-namespace aura {
+namespace ui {
 class Event;
+}
+
+namespace aura {
 class Window;
 namespace client {
 
@@ -20,7 +23,7 @@ class AURA_EXPORT ActivationDelegate {
   // event supplied if the activation is the result of a mouse, or the touch
   // event if the activation is the result of a touch, or NULL if activation is
   // attempted for another reason.
-  virtual bool ShouldActivate(const Event* event) = 0;
+  virtual bool ShouldActivate(const ui::Event* event) = 0;
 
   // Sent when the window is activated.
   virtual void OnActivated() = 0;
diff --git a/ui/aura/client/drag_drop_client.h b/ui/aura/client/drag_drop_client.h
index 0df38b5..49ee306 100644
--- a/ui/aura/client/drag_drop_client.h
+++ b/ui/aura/client/drag_drop_client.h
@@ -6,9 +6,14 @@
 #define UI_AURA_CLIENT_DRAG_DROP_CLIENT_H_
 
 #include "ui/aura/aura_export.h"
-#include "ui/aura/event.h"
+#include "ui/gfx/native_widget_types.h"
+
+namespace gfx {
+class Point;
+}
 
 namespace ui {
+class LocatedEvent;
 class OSExchangeData;
 }
 
@@ -30,10 +35,12 @@ class AURA_EXPORT DragDropClient {
                                int operation) = 0;
 
   // Called when mouse is dragged during a drag and drop.
-  virtual void DragUpdate(aura::Window* target, const LocatedEvent& event) = 0;
+  virtual void DragUpdate(aura::Window* target,
+                          const ui::LocatedEvent& event) = 0;
 
   // Called when mouse is released during a drag and drop.
-  virtual void Drop(aura::Window* target, const LocatedEvent& event) = 0;
+  virtual void Drop(aura::Window* target,
+                    const ui::LocatedEvent& event) = 0;
 
   // Called when a drag and drop session is cancelled.
   virtual void DragCancel() = 0;
diff --git a/ui/aura/client/drag_drop_delegate.h b/ui/aura/client/drag_drop_delegate.h
index 01c6645..dde7f32 100644
--- a/ui/aura/client/drag_drop_delegate.h
+++ b/ui/aura/client/drag_drop_delegate.h
@@ -7,8 +7,11 @@
 
 #include "ui/aura/aura_export.h"
 
-namespace aura {
+namespace ui {
 class DropTargetEvent;
+}
+
+namespace aura {
 class Window;
 namespace client {
 
@@ -18,13 +21,13 @@ class AURA_EXPORT DragDropDelegate {
   // OnDragEntered is invoked when the mouse enters this window during a drag &
   // drop session. This is immediately followed by an invocation of
   // OnDragUpdated, and eventually one of OnDragExited or OnPerformDrop.
-  virtual void OnDragEntered(const DropTargetEvent& event) = 0;
+  virtual void OnDragEntered(const ui::DropTargetEvent& event) = 0;
 
   // Invoked during a drag and drop session while the mouse is over the window.
   // This should return a bitmask of the DragDropTypes::DragOperation supported
   // based on the location of the event. Return 0 to indicate the drop should
   // not be accepted.
-  virtual int OnDragUpdated(const DropTargetEvent& event) = 0;
+  virtual int OnDragUpdated(const ui::DropTargetEvent& event) = 0;
 
   // Invoked during a drag and drop session when the mouse exits the window, or
   // when the drag session was canceled and the mouse was over the window.
@@ -32,7 +35,7 @@ class AURA_EXPORT DragDropDelegate {
 
   // Invoked during a drag and drop session when OnDragUpdated returns a valid
   // operation and the user release the mouse.
-  virtual int OnPerformDrop(const DropTargetEvent& event) = 0;
+  virtual int OnPerformDrop(const ui::DropTargetEvent& event) = 0;
 
  protected:
   virtual ~DragDropDelegate() {}
diff --git a/ui/aura/client/tooltip_client.h b/ui/aura/client/tooltip_client.h
index b9197f1..416547b 100644
--- a/ui/aura/client/tooltip_client.h
+++ b/ui/aura/client/tooltip_client.h
@@ -6,7 +6,6 @@
 #define UI_AURA_CLIENT_TOOLTIP_CLIENT_H_
 
 #include "ui/aura/aura_export.h"
-#include "ui/aura/event.h"
 #include "ui/gfx/font.h"
 
 namespace aura {