Index: ui/views/widget/native_widget_aura.h |
=================================================================== |
--- ui/views/widget/native_widget_aura.h (revision 150582) |
+++ ui/views/widget/native_widget_aura.h (working copy) |
@@ -132,15 +132,16 @@ |
const gfx::Rect& new_bounds) OVERRIDE; |
virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; |
virtual void OnBlur() OVERRIDE; |
- virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; |
+ virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE; |
virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
virtual bool ShouldDescendIntoChildForEventHandling( |
aura::Window* child, |
const gfx::Point& location) OVERRIDE; |
- virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; |
- virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; |
- virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE; |
+ virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE; |
+ virtual ui::TouchStatus OnTouchEvent(ui::TouchEventImpl* event) OVERRIDE; |
+ virtual ui::GestureStatus OnGestureEvent( |
+ ui::GestureEventImpl* event) OVERRIDE; |
virtual bool CanFocus() OVERRIDE; |
virtual void OnCaptureLost() OVERRIDE; |
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
@@ -152,15 +153,15 @@ |
virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; |
// Overridden from aura::client::ActivationDelegate: |
- virtual bool ShouldActivate(const aura::Event* event) OVERRIDE; |
+ virtual bool ShouldActivate(const ui::Event* event) OVERRIDE; |
virtual void OnActivated() OVERRIDE; |
virtual void OnLostActive() OVERRIDE; |
// Overridden from aura::client::DragDropDelegate: |
- virtual void OnDragEntered(const aura::DropTargetEvent& event) OVERRIDE; |
- virtual int OnDragUpdated(const aura::DropTargetEvent& event) OVERRIDE; |
+ virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; |
+ virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; |
virtual void OnDragExited() OVERRIDE; |
- virtual int OnPerformDrop(const aura::DropTargetEvent& event) OVERRIDE; |
+ virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; |
protected: |
virtual ~NativeWidgetAura(); |