| Index: ui/aura/event_filter.cc
|
| diff --git a/ui/aura/event_filter.cc b/ui/aura/event_filter.cc
|
| index d7f4719b468595fe4efca8f027da50c226829383..d8c4f287096a2cf50358b6c34e6047093064cb63 100644
|
| --- a/ui/aura/event_filter.cc
|
| +++ b/ui/aura/event_filter.cc
|
| @@ -41,8 +41,10 @@ ui::EventResult EventFilter::OnScrollEvent(ui::ScrollEvent* event) {
|
| return ui::ER_UNHANDLED;
|
| }
|
|
|
| -ui::TouchStatus EventFilter::OnTouchEvent(ui::TouchEvent* event) {
|
| - return PreHandleTouchEvent(static_cast<Window*>(event->target()), event);
|
| +ui::EventResult EventFilter::OnTouchEvent(ui::TouchEvent* event) {
|
| + ui::TouchStatus status = PreHandleTouchEvent(
|
| + static_cast<Window*>(event->target()), event);
|
| + return ui::EventResultFromTouchStatus(status);
|
| }
|
|
|
| ui::EventResult EventFilter::OnGestureEvent(ui::GestureEvent* event) {
|
|
|