Index: ash/touch/touch_observer_hud.cc |
=================================================================== |
--- ash/touch/touch_observer_hud.cc (revision 150582) |
+++ ash/touch/touch_observer_hud.cc (working copy) |
@@ -9,7 +9,7 @@ |
#include "base/utf_string_conversions.h" |
#include "third_party/skia/include/core/SkPath.h" |
#include "third_party/skia/include/core/SkXfermode.h" |
-#include "ui/aura/event.h" |
+#include "ui/base/event.h" |
#include "ui/gfx/canvas.h" |
#include "ui/gfx/display.h" |
#include "ui/gfx/rect.h" |
@@ -183,18 +183,18 @@ |
} |
bool TouchObserverHUD::PreHandleKeyEvent(aura::Window* target, |
- aura::KeyEvent* event) { |
+ ui::KeyEvent* event) { |
return false; |
} |
bool TouchObserverHUD::PreHandleMouseEvent(aura::Window* target, |
- aura::MouseEvent* event) { |
+ ui::MouseEvent* event) { |
return false; |
} |
ui::TouchStatus TouchObserverHUD::PreHandleTouchEvent( |
aura::Window* target, |
- aura::TouchEvent* event) { |
+ ui::TouchEventImpl* event) { |
if (event->touch_id() >= kMaxTouchPoints) |
return ui::TOUCH_STATUS_UNKNOWN; |
@@ -215,7 +215,7 @@ |
ui::GestureStatus TouchObserverHUD::PreHandleGestureEvent( |
aura::Window* target, |
- aura::GestureEvent* event) { |
+ ui::GestureEventImpl* event) { |
return ui::GESTURE_STATUS_UNKNOWN; |
} |