| Index: cc/animation/scrollbar_animation_controller_linear_fade.h
|
| diff --git a/cc/animation/scrollbar_animation_controller_linear_fade.h b/cc/animation/scrollbar_animation_controller_linear_fade.h
|
| index 107004997849b7e11b7fab062a113a854269c217..c3075565a91c46eb15f39b39cab126a88573e170 100644
|
| --- a/cc/animation/scrollbar_animation_controller_linear_fade.h
|
| +++ b/cc/animation/scrollbar_animation_controller_linear_fade.h
|
| @@ -19,17 +19,19 @@ class CC_EXPORT ScrollbarAnimationControllerLinearFade
|
| LayerImpl* scroll_layer,
|
| ScrollbarAnimationControllerClient* client,
|
| base::TimeDelta delay_before_starting,
|
| + base::TimeDelta resize_delay_before_starting,
|
| base::TimeDelta duration);
|
|
|
| virtual ~ScrollbarAnimationControllerLinearFade();
|
|
|
| - virtual void DidScrollUpdate() OVERRIDE;
|
| + virtual void DidScrollUpdate(bool on_resize) OVERRIDE;
|
|
|
| protected:
|
| ScrollbarAnimationControllerLinearFade(
|
| LayerImpl* scroll_layer,
|
| ScrollbarAnimationControllerClient* client,
|
| base::TimeDelta delay_before_starting,
|
| + base::TimeDelta resize_delay_before_starting,
|
| base::TimeDelta duration);
|
|
|
| virtual void RunAnimationFrame(float progress) OVERRIDE;
|
|
|