| Index: cc/trees/layer_tree_settings.h
|
| diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
|
| index b25a3cd89abe20561f82ce5eff606212cc89bbed..1a5e0344232c9667aade57236640cf7c1dad0754 100644
|
| --- a/cc/trees/layer_tree_settings.h
|
| +++ b/cc/trees/layer_tree_settings.h
|
| @@ -51,9 +51,10 @@ class CC_EXPORT LayerTreeSettings {
|
| AURA_OVERLAY,
|
| };
|
| ScrollbarAnimator scrollbar_animator = NO_ANIMATOR;
|
| - base::TimeDelta scrollbar_fade_delay;
|
| - base::TimeDelta scrollbar_fade_resize_delay;
|
| - base::TimeDelta scrollbar_fade_duration;
|
| + base::TimeDelta scrollbar_fade_in_delay;
|
| + base::TimeDelta scrollbar_fade_out_delay;
|
| + base::TimeDelta scrollbar_fade_out_resize_delay;
|
| + base::TimeDelta scrollbar_fade_out_duration;
|
| base::TimeDelta scrollbar_thinning_duration;
|
| SkColor solid_color_scrollbar_color = SK_ColorWHITE;
|
| bool timeout_and_draw_when_animation_checkerboards = true;
|
|
|