ui/events/gesture_detection/motion_event_generic.h - Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/

Unified Diff: ui/events/gesture_detection/motion_event_generic.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

« no previous file with comments | « ui/events/gesture_detection/motion_event_buffer_unittest.cc ('k') | ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/events/gesture_detection/motion_event_generic.h

diff --git a/ui/events/gesture_detection/motion_event_generic.h b/ui/events/gesture_detection/motion_event_generic.h

index 2750cb210a5e32aff56b6db0cf1f7f5ecc08e40c..41911c1b868e04453cbc46f40eced7cb6372fde8 100644

--- a/ui/events/gesture_detection/motion_event_generic.h

+++ b/ui/events/gesture_detection/motion_event_generic.h

@@ -39,25 +39,25 @@ class GESTURE_DETECTION_EXPORT MotionEventGeneric : public MotionEvent {

virtual ~MotionEventGeneric();

// MotionEvent implementation.

- virtual int GetId() const OVERRIDE;

- virtual Action GetAction() const OVERRIDE;

- virtual int GetActionIndex() const OVERRIDE;

- virtual size_t GetPointerCount() const OVERRIDE;

- virtual int GetPointerId(size_t pointer_index) const OVERRIDE;

- virtual float GetX(size_t pointer_index) const OVERRIDE;

- virtual float GetY(size_t pointer_index) const OVERRIDE;

- virtual float GetRawX(size_t pointer_index) const OVERRIDE;

- virtual float GetRawY(size_t pointer_index) const OVERRIDE;

- virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE;

- virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE;

- virtual float GetOrientation(size_t pointer_index) const OVERRIDE;

- virtual float GetPressure(size_t pointer_index) const OVERRIDE;

- virtual ToolType GetToolType(size_t pointer_index) const OVERRIDE;

- virtual int GetButtonState() const OVERRIDE;

- virtual int GetFlags() const OVERRIDE;

- virtual base::TimeTicks GetEventTime() const OVERRIDE;

- virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE;

- virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE;

+ virtual int GetId() const override;

+ virtual Action GetAction() const override;

+ virtual int GetActionIndex() const override;

+ virtual size_t GetPointerCount() const override;

+ virtual int GetPointerId(size_t pointer_index) const override;

+ virtual float GetX(size_t pointer_index) const override;

+ virtual float GetY(size_t pointer_index) const override;

+ virtual float GetRawX(size_t pointer_index) const override;

+ virtual float GetRawY(size_t pointer_index) const override;

+ virtual float GetTouchMajor(size_t pointer_index) const override;

+ virtual float GetTouchMinor(size_t pointer_index) const override;

+ virtual float GetOrientation(size_t pointer_index) const override;

+ virtual float GetPressure(size_t pointer_index) const override;

+ virtual ToolType GetToolType(size_t pointer_index) const override;

+ virtual int GetButtonState() const override;

+ virtual int GetFlags() const override;

+ virtual base::TimeTicks GetEventTime() const override;

+ virtual scoped_ptr<MotionEvent> Clone() const override;

+ virtual scoped_ptr<MotionEvent> Cancel() const override;

void PushPointer(const PointerProperties& pointer);