| Index: ash/system/tray/tray_event_filter.h
|
| diff --git a/ash/system/tray/tray_event_filter.h b/ash/system/tray/tray_event_filter.h
|
| index 1ab507719da22c00443062d72d6421cfbbf88fbc..87cae2e87a7a073f83ae14db71dc24e126d22ad5 100644
|
| --- a/ash/system/tray/tray_event_filter.h
|
| +++ b/ash/system/tray/tray_event_filter.h
|
| @@ -30,7 +30,7 @@ class TrayEventFilter : public aura::EventFilter {
|
| ui::KeyEvent* event) OVERRIDE;
|
| virtual bool PreHandleMouseEvent(aura::Window* target,
|
| ui::MouseEvent* event) OVERRIDE;
|
| - virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
|
| + virtual ui::EventResult PreHandleTouchEvent(aura::Window* target,
|
| ui::TouchEvent* event) OVERRIDE;
|
| virtual ui::EventResult PreHandleGestureEvent(
|
| aura::Window* target,
|
|
|