| Index: ash/system/tray/tray_event_filter.cc
|
| diff --git a/ash/system/tray/tray_event_filter.cc b/ash/system/tray/tray_event_filter.cc
|
| index 5a0355e53b1a042da4950e4d6d6fa75f538dc4bf..c148c97021cad81c3eca7b664c0876d71e5c5c00 100644
|
| --- a/ash/system/tray/tray_event_filter.cc
|
| +++ b/ash/system/tray/tray_event_filter.cc
|
| @@ -41,13 +41,13 @@ bool TrayEventFilter::PreHandleMouseEvent(aura::Window* target,
|
| return false;
|
| }
|
|
|
| -ui::TouchStatus TrayEventFilter::PreHandleTouchEvent(aura::Window* target,
|
| +ui::EventResult TrayEventFilter::PreHandleTouchEvent(aura::Window* target,
|
| ui::TouchEvent* event) {
|
| if (event->type() == ui::ET_TOUCH_PRESSED) {
|
| if (ProcessLocatedEvent(target, *event))
|
| - return ui::TOUCH_STATUS_END;
|
| + return ui::ER_CONSUMED;
|
| }
|
| - return ui::TOUCH_STATUS_UNKNOWN;
|
| + return ui::ER_UNHANDLED;
|
| }
|
|
|
| ui::EventResult TrayEventFilter::PreHandleGestureEvent(
|
|
|