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 60edfba485672025d2cac09bd013bf6751c27bd8..7cc7a42485307dd56fa906b1c0df482d808e2a99 100644 |
--- a/ui/events/gestures/gesture_recognizer_impl.h |
+++ b/ui/events/gestures/gesture_recognizer_impl.h |
@@ -31,22 +31,20 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer, |
typedef std::map<int, GestureConsumer*> TouchIdToConsumerMap; |
GestureRecognizerImpl(); |
- virtual ~GestureRecognizerImpl(); |
+ ~GestureRecognizerImpl() override; |
std::vector<GestureEventHelper*>& helpers() { return helpers_; } |
// Overridden from GestureRecognizer |
- virtual GestureConsumer* GetTouchLockedTarget( |
- const TouchEvent& event) override; |
- virtual GestureConsumer* GetTargetForGestureEvent( |
- const GestureEvent& event) override; |
- virtual GestureConsumer* GetTargetForLocation( |
- const gfx::PointF& location, int source_device_id) override; |
- virtual void TransferEventsTo(GestureConsumer* current_consumer, |
- GestureConsumer* new_consumer) override; |
- virtual bool GetLastTouchPointForTarget(GestureConsumer* consumer, |
- gfx::PointF* point) override; |
- virtual bool CancelActiveTouches(GestureConsumer* consumer) override; |
+ GestureConsumer* GetTouchLockedTarget(const TouchEvent& event) override; |
+ GestureConsumer* GetTargetForGestureEvent(const GestureEvent& event) override; |
+ GestureConsumer* GetTargetForLocation(const gfx::PointF& location, |
+ int source_device_id) override; |
+ void TransferEventsTo(GestureConsumer* current_consumer, |
+ GestureConsumer* new_consumer) override; |
+ bool GetLastTouchPointForTarget(GestureConsumer* consumer, |
+ gfx::PointF* point) override; |
+ bool CancelActiveTouches(GestureConsumer* consumer) override; |
protected: |
virtual GestureProviderAura* GetGestureProviderForConsumer( |
@@ -59,26 +57,23 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer, |
void DispatchGestureEvent(GestureEvent* event); |
// Overridden from GestureRecognizer |
- virtual bool ProcessTouchEventPreDispatch(const TouchEvent& event, |
- GestureConsumer* consumer) override; |
+ bool ProcessTouchEventPreDispatch(const TouchEvent& event, |
+ GestureConsumer* consumer) override; |
- virtual Gestures* ProcessTouchEventPostDispatch( |
- const TouchEvent& event, |
- ui::EventResult result, |
- GestureConsumer* consumer) override; |
+ Gestures* ProcessTouchEventPostDispatch(const TouchEvent& event, |
+ ui::EventResult result, |
+ GestureConsumer* consumer) override; |
- virtual Gestures* ProcessTouchEventOnAsyncAck( |
- const TouchEvent& event, |
- ui::EventResult result, |
- GestureConsumer* consumer) override; |
+ Gestures* ProcessTouchEventOnAsyncAck(const TouchEvent& event, |
+ ui::EventResult result, |
+ GestureConsumer* consumer) override; |
- virtual bool CleanupStateForConsumer(GestureConsumer* consumer) |
- override; |
- virtual void AddGestureEventHelper(GestureEventHelper* helper) override; |
- virtual void RemoveGestureEventHelper(GestureEventHelper* helper) override; |
+ bool CleanupStateForConsumer(GestureConsumer* consumer) override; |
+ void AddGestureEventHelper(GestureEventHelper* helper) override; |
+ void RemoveGestureEventHelper(GestureEventHelper* helper) override; |
// Overridden from GestureProviderAuraClient |
- virtual void OnGestureEvent(GestureEvent* event) override; |
+ void OnGestureEvent(GestureEvent* event) override; |
// Convenience method to find the GestureEventHelper that can dispatch events |
// to a specific |consumer|. |