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 739d1df0677e3ad58028ba59254a036f60b115e6..15d92ad415700be4b168a4f8223e51a844d0cec0 100644 |
--- a/ui/events/gestures/gesture_provider_aura.cc |
+++ b/ui/events/gestures/gesture_provider_aura.cc |
@@ -42,16 +42,16 @@ bool GestureProviderAura::OnTouchEvent(TouchEvent* event) { |
return true; |
} |
-void GestureProviderAura::OnTouchEventAck(uint32_t unique_event_id, |
- bool event_consumed) { |
+void GestureProviderAura::OnTouchEventAck(uint32_t unique_touch_event_id, |
+ bool event_consumed) { |
DCHECK(pending_gestures_.empty()); |
DCHECK(!handling_event_); |
base::AutoReset<bool> handling_event(&handling_event_, true); |
- filtered_gesture_provider_.OnTouchEventAck(unique_event_id, event_consumed); |
+ filtered_gesture_provider_.OnTouchEventAck(unique_touch_event_id, |
+ event_consumed); |
} |
-void GestureProviderAura::OnGestureEvent( |
- const GestureEventData& gesture) { |
+void GestureProviderAura::OnGestureEvent(const GestureEventData& gesture) { |
std::unique_ptr<ui::GestureEvent> event( |
new ui::GestureEvent(gesture.x, gesture.y, gesture.flags, |
gesture.time - base::TimeTicks(), gesture.details)); |