| Index: ui/events/gestures/gesture_recognizer_impl.h
|
| diff --git a/ui/events/gestures/gesture_recognizer_impl.h b/ui/events/gestures/gesture_recognizer_impl.h
|
| index 59c92cfb4a49649dea8dc640cb1011165d193129..da47c5346979465373701b195b0acf91a328a15f 100644
|
| --- a/ui/events/gestures/gesture_recognizer_impl.h
|
| +++ b/ui/events/gestures/gesture_recognizer_impl.h
|
| @@ -23,8 +23,7 @@ class GestureEventHelper;
|
| class GestureSequence;
|
| class TouchEvent;
|
|
|
| -class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
|
| - public GestureSequenceDelegate {
|
| +class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer {
|
| public:
|
| typedef std::map<int, GestureConsumer*> TouchIdToConsumerMap;
|
|
|
| @@ -47,8 +46,10 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
|
| virtual void CancelActiveTouches(GestureConsumer* consumer) OVERRIDE;
|
|
|
| protected:
|
| - virtual GestureSequence* CreateSequence(GestureSequenceDelegate* delegate);
|
| - virtual GestureSequence* GetGestureSequenceForConsumer(GestureConsumer* c);
|
| + virtual GestureSequence* CreateSequence(
|
| + GestureEventQueueTimerInterface* geq_timers);
|
| + virtual GestureSequence* GetGestureSequenceForConsumer(
|
| + GestureConsumer* c, GestureEventQueueTimerInterface* geq_timers);
|
|
|
| private:
|
| // Sets up the target consumer for gestures based on the touch-event.
|
| @@ -58,15 +59,12 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
|
| // Overridden from GestureRecognizer
|
| virtual Gestures* ProcessTouchEventForGesture(
|
| const TouchEvent& event,
|
| - ui::EventResult result,
|
| - GestureConsumer* target) OVERRIDE;
|
| + GestureConsumer* target,
|
| + GestureEventQueueTimerInterface* geq_timers) OVERRIDE;
|
| virtual void CleanupStateForConsumer(GestureConsumer* consumer) OVERRIDE;
|
| virtual void AddGestureEventHelper(GestureEventHelper* helper) OVERRIDE;
|
| virtual void RemoveGestureEventHelper(GestureEventHelper* helper) OVERRIDE;
|
|
|
| - // Overridden from ui::GestureSequenceDelegate.
|
| - virtual void DispatchPostponedGestureEvent(GestureEvent* event) OVERRIDE;
|
| -
|
| // Convenience method to find the GestureEventHelper that can dispatch events
|
| // to a specific |consumer|.
|
| GestureEventHelper* FindDispatchHelperForConsumer(GestureConsumer* consumer);
|
|
|