| 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 41911c1b868e04453cbc46f40eced7cb6372fde8..17109cb13801971fc94186d66b0a04b9b3760049 100644
|
| --- a/ui/events/gesture_detection/motion_event_generic.h
|
| +++ b/ui/events/gesture_detection/motion_event_generic.h
|
| @@ -36,28 +36,28 @@ class GESTURE_DETECTION_EXPORT MotionEventGeneric : public MotionEvent {
|
| const PointerProperties& pointer);
|
| MotionEventGeneric(const MotionEventGeneric& other);
|
|
|
| - virtual ~MotionEventGeneric();
|
| + ~MotionEventGeneric() override;
|
|
|
| // 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;
|
| + int GetId() const override;
|
| + Action GetAction() const override;
|
| + int GetActionIndex() const override;
|
| + size_t GetPointerCount() const override;
|
| + int GetPointerId(size_t pointer_index) const override;
|
| + float GetX(size_t pointer_index) const override;
|
| + float GetY(size_t pointer_index) const override;
|
| + float GetRawX(size_t pointer_index) const override;
|
| + float GetRawY(size_t pointer_index) const override;
|
| + float GetTouchMajor(size_t pointer_index) const override;
|
| + float GetTouchMinor(size_t pointer_index) const override;
|
| + float GetOrientation(size_t pointer_index) const override;
|
| + float GetPressure(size_t pointer_index) const override;
|
| + ToolType GetToolType(size_t pointer_index) const override;
|
| + int GetButtonState() const override;
|
| + int GetFlags() const override;
|
| + base::TimeTicks GetEventTime() const override;
|
| + scoped_ptr<MotionEvent> Clone() const override;
|
| + scoped_ptr<MotionEvent> Cancel() const override;
|
|
|
| void PushPointer(const PointerProperties& pointer);
|
|
|
|
|