diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
| commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
| tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/ui/events/android | |
| parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
| download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz | |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/ui/events/android')
| -rw-r--r-- | chromium/ui/events/android/scroller.h | 8 |
1 files changed, 4 insertions, 4 deletions
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. |