| Index: ui/events/gestures/gesture_provider_aura.cc
|
| diff --git a/ui/events/gestures/gesture_provider_aura.cc b/ui/events/gestures/gesture_provider_aura.cc
|
| index b8e83b25a2905326565ebee8e67fee9c11a263de..42fbf071760e112290153bea51a5619b5d2e3771 100644
|
| --- a/ui/events/gestures/gesture_provider_aura.cc
|
| +++ b/ui/events/gestures/gesture_provider_aura.cc
|
| @@ -43,12 +43,11 @@ bool GestureProviderAura::OnTouchEvent(TouchEvent* event) {
|
| }
|
|
|
| void GestureProviderAura::OnTouchEventAck(uint32_t unique_touch_event_id,
|
| - bool event_consumed) {
|
| + EventResult result) {
|
| DCHECK(pending_gestures_.empty());
|
| DCHECK(!handling_event_);
|
| base::AutoReset<bool> handling_event(&handling_event_, true);
|
| - filtered_gesture_provider_.OnTouchEventAck(unique_touch_event_id,
|
| - event_consumed);
|
| + filtered_gesture_provider_.OnTouchEventAck(unique_touch_event_id, result);
|
| }
|
|
|
| void GestureProviderAura::OnGestureEvent(const GestureEventData& gesture) {
|
| @@ -82,7 +81,7 @@ void GestureProviderAura::OnTouchEnter(int pointer_id, float x, float y) {
|
| touch_event->set_root_location_f(point);
|
|
|
| OnTouchEvent(touch_event.get());
|
| - OnTouchEventAck(touch_event->unique_event_id(), true);
|
| + OnTouchEventAck(touch_event->unique_event_id(), ER_CONSUMED);
|
| }
|
|
|
| } // namespace content
|
|
|