From 813fbf95af77a531c57a8c497345ad2c61d475b3 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 18 Jun 2015 14:10:49 +0200 Subject: BASELINE: Update chromium to 44.0.2403.47 Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen --- chromium/ui/events/android/scroller.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chromium/ui/events/android') diff --git a/chromium/ui/events/android/scroller.h b/chromium/ui/events/android/scroller.h index f276a836877..37d41cd3e1b 100644 --- a/chromium/ui/events/android/scroller.h +++ b/chromium/ui/events/android/scroller.h @@ -28,12 +28,12 @@ class EVENTS_BASE_EXPORT Scroller : public GestureCurve { }; explicit Scroller(const Config& config); - virtual ~Scroller(); + ~Scroller() override; // GestureCurve implementation. - virtual bool ComputeScrollOffset(base::TimeTicks time, - gfx::Vector2dF* offset, - gfx::Vector2dF* velocity) override; + bool ComputeScrollOffset(base::TimeTicks time, + gfx::Vector2dF* offset, + gfx::Vector2dF* velocity) override; // Start scrolling by providing a starting point and the distance to travel. // The default value of 250 milliseconds will be used for the duration. -- cgit v1.2.1