diff options
author | dcheng <dcheng@chromium.org> | 2014-10-21 03:53:26 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 10:54:09 +0000 |
commit | 08038795458017a039565cfa158f0c379f91a007 (patch) | |
tree | 3f0aed23e0537e1be53a714c3c5d8b7b515f8c7b /ui/events/gestures | |
parent | 43815b018eb71e762657cb650496ea6d83134c31 (diff) | |
download | chromium_src-08038795458017a039565cfa158f0c379f91a007.zip chromium_src-08038795458017a039565cfa158f0c379f91a007.tar.gz chromium_src-08038795458017a039565cfa158f0c379f91a007.tar.bz2 |
Standardize usage of virtual/override/final in ui/
This patch was automatically generated by applying clang fixit hints
generated by the plugin to the source tree.
BUG=417463
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/667923002
Cr-Commit-Position: refs/heads/master@{#300446}
Diffstat (limited to 'ui/events/gestures')
-rw-r--r-- | ui/events/gestures/fling_curve.h | 8 | ||||
-rw-r--r-- | ui/events/gestures/gesture_recognizer_impl_mac.cc | 48 |
2 files changed, 25 insertions, 31 deletions
diff --git a/ui/events/gestures/fling_curve.h b/ui/events/gestures/fling_curve.h index bebf6ab..edf0910 100644 --- a/ui/events/gestures/fling_curve.h +++ b/ui/events/gestures/fling_curve.h @@ -18,12 +18,12 @@ namespace ui { class EVENTS_BASE_EXPORT FlingCurve : public GestureCurve { public: FlingCurve(const gfx::Vector2dF& velocity, base::TimeTicks start_timestamp); - virtual ~FlingCurve(); + ~FlingCurve() override; // GestureCurve implementation. - virtual bool ComputeScrollOffset(base::TimeTicks time, - gfx::Vector2dF* offset, - gfx::Vector2dF* velocity) override; + bool ComputeScrollOffset(base::TimeTicks time, + gfx::Vector2dF* offset, + gfx::Vector2dF* velocity) override; // In contrast to |ComputeScrollOffset()|, this method is stateful and // returns the *change* in scroll offset between successive calls. diff --git a/ui/events/gestures/gesture_recognizer_impl_mac.cc b/ui/events/gestures/gesture_recognizer_impl_mac.cc index b123593..a0d4ba4 100644 --- a/ui/events/gestures/gesture_recognizer_impl_mac.cc +++ b/ui/events/gestures/gesture_recognizer_impl_mac.cc @@ -14,53 +14,47 @@ namespace { class GestureRecognizerImplMac : public GestureRecognizer { public: GestureRecognizerImplMac() {} - virtual ~GestureRecognizerImplMac() {} + ~GestureRecognizerImplMac() override {} private: - virtual bool ProcessTouchEventPreDispatch( - const TouchEvent& event, - GestureConsumer* consumer) override { + bool ProcessTouchEventPreDispatch(const TouchEvent& event, + GestureConsumer* consumer) override { return false; } - virtual Gestures* ProcessTouchEventPostDispatch( - const TouchEvent& event, - ui::EventResult result, - GestureConsumer* consumer) override { + Gestures* ProcessTouchEventPostDispatch(const TouchEvent& event, + ui::EventResult result, + GestureConsumer* consumer) override { return NULL; } - virtual Gestures* ProcessTouchEventOnAsyncAck( - const TouchEvent& event, - ui::EventResult result, - GestureConsumer* consumer) override { + Gestures* ProcessTouchEventOnAsyncAck(const TouchEvent& event, + ui::EventResult result, + GestureConsumer* consumer) override { return NULL; }; - virtual bool CleanupStateForConsumer(GestureConsumer* consumer) override { + bool CleanupStateForConsumer(GestureConsumer* consumer) override { return false; } - virtual GestureConsumer* GetTouchLockedTarget( - const TouchEvent& event) override { + GestureConsumer* GetTouchLockedTarget(const TouchEvent& event) override { return NULL; } - virtual GestureConsumer* GetTargetForGestureEvent( + GestureConsumer* GetTargetForGestureEvent( const GestureEvent& event) override { return NULL; } - virtual GestureConsumer* GetTargetForLocation(const gfx::PointF& location, - int source_device_id) override { + GestureConsumer* GetTargetForLocation(const gfx::PointF& location, + int source_device_id) override { return NULL; } - virtual void TransferEventsTo(GestureConsumer* current_consumer, - GestureConsumer* new_consumer) override {} - virtual bool GetLastTouchPointForTarget(GestureConsumer* consumer, - gfx::PointF* point) override { + void TransferEventsTo(GestureConsumer* current_consumer, + GestureConsumer* new_consumer) override {} + bool GetLastTouchPointForTarget(GestureConsumer* consumer, + gfx::PointF* point) override { return false; } - virtual bool CancelActiveTouches(GestureConsumer* consumer) override { - return false; - } - virtual void AddGestureEventHelper(GestureEventHelper* helper) override {} - virtual void RemoveGestureEventHelper(GestureEventHelper* helper) override {} + bool CancelActiveTouches(GestureConsumer* consumer) override { return false; } + void AddGestureEventHelper(GestureEventHelper* helper) override {} + void RemoveGestureEventHelper(GestureEventHelper* helper) override {} DISALLOW_COPY_AND_ASSIGN(GestureRecognizerImplMac); }; |