Index: ui/events/gesture_detection/motion_event_buffer.cc |
diff --git a/ui/events/gesture_detection/motion_event_buffer.cc b/ui/events/gesture_detection/motion_event_buffer.cc |
index 26fc5ba6ec9c374ca6a8cf47c8286bd93848c521..89690d650c40d2a7502c77df56e5f140d02053a9 100644 |
--- a/ui/events/gesture_detection/motion_event_buffer.cc |
+++ b/ui/events/gesture_detection/motion_event_buffer.cc |
@@ -173,98 +173,91 @@ class CompoundMotionEvent : public ui::MotionEvent { |
: events_(events.Pass()) { |
DCHECK_GE(events_.size(), 1U); |
} |
- virtual ~CompoundMotionEvent() {} |
+ ~CompoundMotionEvent() override {} |
- virtual int GetId() const override { return latest().GetId(); } |
+ int GetId() const override { return latest().GetId(); } |
- virtual Action GetAction() const override { return latest().GetAction(); } |
+ Action GetAction() const override { return latest().GetAction(); } |
- virtual int GetActionIndex() const override { |
- return latest().GetActionIndex(); |
- } |
+ int GetActionIndex() const override { return latest().GetActionIndex(); } |
- virtual size_t GetPointerCount() const override { |
- return latest().GetPointerCount(); |
- } |
+ size_t GetPointerCount() const override { return latest().GetPointerCount(); } |
- virtual int GetPointerId(size_t pointer_index) const override { |
+ int GetPointerId(size_t pointer_index) const override { |
return latest().GetPointerId(pointer_index); |
} |
- virtual float GetX(size_t pointer_index) const override { |
+ float GetX(size_t pointer_index) const override { |
return latest().GetX(pointer_index); |
} |
- virtual float GetY(size_t pointer_index) const override { |
+ float GetY(size_t pointer_index) const override { |
return latest().GetY(pointer_index); |
} |
- virtual float GetRawX(size_t pointer_index) const override { |
+ float GetRawX(size_t pointer_index) const override { |
return latest().GetRawX(pointer_index); |
} |
- virtual float GetRawY(size_t pointer_index) const override { |
+ float GetRawY(size_t pointer_index) const override { |
return latest().GetRawY(pointer_index); |
} |
- virtual float GetTouchMajor(size_t pointer_index) const override { |
+ float GetTouchMajor(size_t pointer_index) const override { |
return latest().GetTouchMajor(pointer_index); |
} |
- virtual float GetTouchMinor(size_t pointer_index) const override { |
+ float GetTouchMinor(size_t pointer_index) const override { |
return latest().GetTouchMinor(pointer_index); |
} |
- virtual float GetOrientation(size_t pointer_index) const override { |
+ float GetOrientation(size_t pointer_index) const override { |
return latest().GetOrientation(pointer_index); |
} |
- virtual float GetPressure(size_t pointer_index) const override { |
+ float GetPressure(size_t pointer_index) const override { |
return latest().GetPressure(pointer_index); |
} |
- virtual ToolType GetToolType(size_t pointer_index) const override { |
+ ToolType GetToolType(size_t pointer_index) const override { |
return latest().GetToolType(pointer_index); |
} |
- virtual int GetButtonState() const override { |
- return latest().GetButtonState(); |
- } |
+ int GetButtonState() const override { return latest().GetButtonState(); } |
- virtual int GetFlags() const override { return latest().GetFlags(); } |
+ int GetFlags() const override { return latest().GetFlags(); } |
- virtual base::TimeTicks GetEventTime() const override { |
+ base::TimeTicks GetEventTime() const override { |
return latest().GetEventTime(); |
} |
- virtual size_t GetHistorySize() const override { return events_.size() - 1; } |
+ size_t GetHistorySize() const override { return events_.size() - 1; } |
- virtual base::TimeTicks GetHistoricalEventTime( |
+ base::TimeTicks GetHistoricalEventTime( |
size_t historical_index) const override { |
DCHECK_LT(historical_index, GetHistorySize()); |
return events_[historical_index]->GetEventTime(); |
} |
- virtual float GetHistoricalTouchMajor( |
- size_t pointer_index, |
- size_t historical_index) const override { |
+ float GetHistoricalTouchMajor(size_t pointer_index, |
+ size_t historical_index) const override { |
DCHECK_LT(historical_index, GetHistorySize()); |
return events_[historical_index]->GetTouchMajor(); |
} |
- virtual float GetHistoricalX(size_t pointer_index, |
- size_t historical_index) const override { |
+ float GetHistoricalX(size_t pointer_index, |
+ size_t historical_index) const override { |
DCHECK_LT(historical_index, GetHistorySize()); |
return events_[historical_index]->GetX(pointer_index); |
} |
- virtual float GetHistoricalY(size_t pointer_index, |
- size_t historical_index) const override { |
+ float GetHistoricalY(size_t pointer_index, |
+ size_t historical_index) const override { |
DCHECK_LT(historical_index, GetHistorySize()); |
return events_[historical_index]->GetY(pointer_index); |
} |
- virtual scoped_ptr<MotionEvent> Clone() const override { |
+ scoped_ptr<MotionEvent> Clone() const override { |
MotionEventVector cloned_events; |
cloned_events.reserve(events_.size()); |
for (size_t i = 0; i < events_.size(); ++i) |
@@ -273,9 +266,7 @@ class CompoundMotionEvent : public ui::MotionEvent { |
new CompoundMotionEvent(cloned_events.Pass())); |
} |
- virtual scoped_ptr<MotionEvent> Cancel() const override { |
- return latest().Cancel(); |
- } |
+ scoped_ptr<MotionEvent> Cancel() const override { return latest().Cancel(); } |
// Returns the new, resampled event, or NULL if none was created. |
// TODO(jdduke): Revisit resampling to handle cases where alternating frames |