Convert Aura to use ui::Event.

ash/system/tray/tray_bubble_view.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_SYSTEM_TRAY_TRAY_BUBBLE_VIEW_H_
 #define ASH_SYSTEM_TRAY_TRAY_BUBBLE_VIEW_H_
 
 #include "ash/wm/shelf_types.h"
 #include "ui/aura/event_filter.h"
 #include "ui/views/bubble/bubble_delegate.h"
 
-namespace aura {
+namespace ui {
 class LocatedEvent;
 }
 
 namespace views {
 class View;
 class Widget;
 }
 
 namespace ash {
 namespace internal {
@@ skipping 18 matching lines @@
                                  TrayBubbleView* bubble_view,
                                  views::View* tray_view);
 
     virtual void BubbleViewDestroyed() = 0;
     virtual void OnMouseEnteredView() = 0;
     virtual void OnMouseExitedView() = 0;
     virtual void OnClickedOutsideView() = 0;
 
     // Overridden from aura::EventFilter.
     virtual bool PreHandleKeyEvent(aura::Window* target,
-                                   aura::KeyEvent* event) OVERRIDE;
+                                   ui::KeyEvent* event) OVERRIDE;
     virtual bool PreHandleMouseEvent(aura::Window* target,
-                                     aura::MouseEvent* event) OVERRIDE;
+                                     ui::MouseEvent* event) OVERRIDE;
     virtual ui::TouchStatus PreHandleTouchEvent(
         aura::Window* target,
-        aura::TouchEvent* event) OVERRIDE;
+        ui::TouchEventImpl* event) OVERRIDE;
     virtual ui::GestureStatus PreHandleGestureEvent(
         aura::Window* target,
-        aura::GestureEvent* event) OVERRIDE;
+        ui::GestureEventImpl* event) OVERRIDE;
 
    private:
-    void ProcessLocatedEvent(const aura::LocatedEvent& event);
+    void ProcessLocatedEvent(const ui::LocatedEvent& event);
 
     views::Widget* widget_;
     views::View* tray_view_;
 
     DISALLOW_COPY_AND_ASSIGN(Host);
   };
 
   struct InitParams {
     static const int kArrowDefaultOffset;
 
@@ skipping 58 matching lines @@
   InitParams params_;
   Host* host_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBubbleView);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_BUBBLE_VIEW_H_