| Index: ui/events/gesture_detection/velocity_tracker.cc
|
| diff --git a/ui/events/gesture_detection/velocity_tracker.cc b/ui/events/gesture_detection/velocity_tracker.cc
|
| index 16454e80c3eec6fa301554c8c560dc57e430710a..a3fd83e2e22247b6f9c77e04c10b39e65246c678 100644
|
| --- a/ui/events/gesture_detection/velocity_tracker.cc
|
| +++ b/ui/events/gesture_detection/velocity_tracker.cc
|
| @@ -121,13 +121,13 @@ class LeastSquaresVelocityTrackerStrategy : public VelocityTrackerStrategy {
|
| Weighting weighting = WEIGHTING_NONE);
|
| virtual ~LeastSquaresVelocityTrackerStrategy();
|
|
|
| - virtual void Clear() OVERRIDE;
|
| - virtual void ClearPointers(BitSet32 id_bits) OVERRIDE;
|
| + virtual void Clear() override;
|
| + virtual void ClearPointers(BitSet32 id_bits) override;
|
| virtual void AddMovement(const TimeTicks& event_time,
|
| BitSet32 id_bits,
|
| - const Position* positions) OVERRIDE;
|
| + const Position* positions) override;
|
| virtual bool GetEstimator(uint32_t id,
|
| - Estimator* out_estimator) const OVERRIDE;
|
| + Estimator* out_estimator) const override;
|
|
|
| private:
|
| // Sample horizon.
|
| @@ -160,13 +160,13 @@ class IntegratingVelocityTrackerStrategy : public VelocityTrackerStrategy {
|
| explicit IntegratingVelocityTrackerStrategy(uint32_t degree);
|
| virtual ~IntegratingVelocityTrackerStrategy();
|
|
|
| - virtual void Clear() OVERRIDE;
|
| - virtual void ClearPointers(BitSet32 id_bits) OVERRIDE;
|
| + virtual void Clear() override;
|
| + virtual void ClearPointers(BitSet32 id_bits) override;
|
| virtual void AddMovement(const TimeTicks& event_time,
|
| BitSet32 id_bits,
|
| - const Position* positions) OVERRIDE;
|
| + const Position* positions) override;
|
| virtual bool GetEstimator(uint32_t id,
|
| - Estimator* out_estimator) const OVERRIDE;
|
| + Estimator* out_estimator) const override;
|
|
|
| private:
|
| // Current state estimate for a particular pointer.
|
|
|