| 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 01a751b18497439c6391ace7817b88c1275c8dcc..e1a223c1cf6629352947815b481060af838ef789 100644
|
| --- a/ash/system/tray/tray_event_filter.cc
|
| +++ b/ash/system/tray/tray_event_filter.cc
|
| @@ -36,12 +36,9 @@ ui::EventResult TrayEventFilter::OnMouseEvent(ui::MouseEvent* event) {
|
| return ui::ER_UNHANDLED;
|
| }
|
|
|
| -ui::EventResult TrayEventFilter::OnTouchEvent(ui::TouchEvent* event) {
|
| - if (event->type() == ui::ET_TOUCH_PRESSED &&
|
| - ProcessLocatedEvent(event)) {
|
| - return ui::ER_CONSUMED;
|
| - }
|
| - return ui::ER_UNHANDLED;
|
| +void TrayEventFilter::OnTouchEvent(ui::TouchEvent* event) {
|
| + if (event->type() == ui::ET_TOUCH_PRESSED && ProcessLocatedEvent(event))
|
| + event->StopPropagation();
|
| }
|
|
|
| bool TrayEventFilter::ProcessLocatedEvent(ui::LocatedEvent* event) {
|
|
|