summaryrefslogtreecommitdiffstats
path: root/cc/animation/scrollbar_animation_controller_thinning.h
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 21:38:24 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 21:38:24 +0000
commitf620b0e71676e17d1d5289fa0f44693f0d9e2f83 (patch)
treeddb3d2616b9d8c5d0b35063bf1ca8d4558d70bde /cc/animation/scrollbar_animation_controller_thinning.h
parentac19cac3c85e67c0c185ec187945896f8ef60055 (diff)
downloadchromium_src-f620b0e71676e17d1d5289fa0f44693f0d9e2f83.zip
chromium_src-f620b0e71676e17d1d5289fa0f44693f0d9e2f83.tar.gz
chromium_src-f620b0e71676e17d1d5289fa0f44693f0d9e2f83.tar.bz2
Grow scrollbars while the mouse is over the track or thumb.
For overlay scrollbars, when the mouse is over the scrollbar, prevent the animation from making the scrollbar smaller. BUG=274010 R=enne@chromium.org Review URL: https://codereview.chromium.org/24782002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/animation/scrollbar_animation_controller_thinning.h')
-rw-r--r--cc/animation/scrollbar_animation_controller_thinning.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/cc/animation/scrollbar_animation_controller_thinning.h b/cc/animation/scrollbar_animation_controller_thinning.h
index 1f0d41d..8038745 100644
--- a/cc/animation/scrollbar_animation_controller_thinning.h
+++ b/cc/animation/scrollbar_animation_controller_thinning.h
@@ -37,6 +37,7 @@ class CC_EXPORT ScrollbarAnimationControllerThinning
virtual bool Animate(base::TimeTicks now) OVERRIDE;
virtual void DidScrollGestureBegin() OVERRIDE;
virtual void DidScrollGestureEnd(base::TimeTicks now) OVERRIDE;
+ virtual void DidMouseMoveOffScrollbar(base::TimeTicks now) OVERRIDE;
virtual bool DidScrollUpdate(base::TimeTicks now) OVERRIDE;
virtual bool DidMouseMoveNear(base::TimeTicks now, float distance) OVERRIDE;
@@ -58,6 +59,7 @@ class CC_EXPORT ScrollbarAnimationControllerThinning
base::TimeTicks last_awaken_time_;
bool scroll_gesture_in_progress_;
+ bool mouse_is_over_scrollbar_;
base::TimeDelta animation_delay_;
base::TimeDelta animation_duration_;