Index: ash/system/tray/tray_bubble_view.h |
=================================================================== |
--- ash/system/tray/tray_bubble_view.h (revision 150582) |
+++ ash/system/tray/tray_bubble_view.h (working copy) |
@@ -9,7 +9,7 @@ |
#include "ui/aura/event_filter.h" |
#include "ui/views/bubble/bubble_delegate.h" |
-namespace aura { |
+namespace ui { |
class LocatedEvent; |
} |
@@ -48,18 +48,18 @@ |
// 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_; |