Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: ui/events/gestures/gesture_recognizer_impl.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 7ba74f3c58ee808aa03f8670a2ec1c38b50f9be3..60edfba485672025d2cac09bd013bf6751c27bd8 100644
--- a/ui/events/gestures/gesture_recognizer_impl.h
+++ b/ui/events/gestures/gesture_recognizer_impl.h
@@ -37,16 +37,16 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
// Overridden from GestureRecognizer
virtual GestureConsumer* GetTouchLockedTarget(
- const TouchEvent& event) OVERRIDE;
+ const TouchEvent& event) override;
virtual GestureConsumer* GetTargetForGestureEvent(
- const GestureEvent& event) OVERRIDE;
+ const GestureEvent& event) override;
virtual GestureConsumer* GetTargetForLocation(
- const gfx::PointF& location, int source_device_id) OVERRIDE;
+ const gfx::PointF& location, int source_device_id) override;
virtual void TransferEventsTo(GestureConsumer* current_consumer,
- GestureConsumer* new_consumer) OVERRIDE;
+ GestureConsumer* new_consumer) override;
virtual bool GetLastTouchPointForTarget(GestureConsumer* consumer,
- gfx::PointF* point) OVERRIDE;
- virtual bool CancelActiveTouches(GestureConsumer* consumer) OVERRIDE;
+ gfx::PointF* point) override;
+ virtual bool CancelActiveTouches(GestureConsumer* consumer) override;
protected:
virtual GestureProviderAura* GetGestureProviderForConsumer(
@@ -60,25 +60,25 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
// Overridden from GestureRecognizer
virtual bool ProcessTouchEventPreDispatch(const TouchEvent& event,
- GestureConsumer* consumer) OVERRIDE;
+ GestureConsumer* consumer) override;
virtual Gestures* ProcessTouchEventPostDispatch(
const TouchEvent& event,
ui::EventResult result,
- GestureConsumer* consumer) OVERRIDE;
+ GestureConsumer* consumer) override;
virtual Gestures* ProcessTouchEventOnAsyncAck(
const TouchEvent& event,
ui::EventResult result,
- GestureConsumer* consumer) OVERRIDE;
+ GestureConsumer* consumer) override;
virtual bool CleanupStateForConsumer(GestureConsumer* consumer)
- OVERRIDE;
- virtual void AddGestureEventHelper(GestureEventHelper* helper) OVERRIDE;
- virtual void RemoveGestureEventHelper(GestureEventHelper* helper) OVERRIDE;
+ override;
+ virtual void AddGestureEventHelper(GestureEventHelper* helper) override;
+ virtual void RemoveGestureEventHelper(GestureEventHelper* helper) override;
// Overridden from GestureProviderAuraClient
- virtual void OnGestureEvent(GestureEvent* event) OVERRIDE;
+ virtual void OnGestureEvent(GestureEvent* event) override;
// Convenience method to find the GestureEventHelper that can dispatch events
// to a specific |consumer|.
« no previous file with comments | « ui/events/gestures/gesture_provider_aura_unittest.cc ('k') | ui/events/gestures/gesture_recognizer_impl_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698