Index: cc/top_controls_manager.h |
diff --git a/cc/top_controls_manager.h b/cc/top_controls_manager.h |
index 6ecd352e03c9c7800398c22ed0c7f7e0b110d3f5..5f7ec3fc12a599f6f69904a0867fc7e8c9ea65d7 100644 |
--- a/cc/top_controls_manager.h |
+++ b/cc/top_controls_manager.h |
@@ -42,14 +42,14 @@ class CC_EXPORT TopControlsManager { |
} |
AnimationDirection animation_direction() { return animation_direction_; } |
- void UpdateDrawPositions(); |
- |
void ScrollBegin(); |
gfx::Vector2dF ScrollBy(const gfx::Vector2dF pending_delta); |
void ScrollEnd(); |
void Animate(base::TimeTicks monotonic_time); |
+ void ProgrammaticScroll(gfx::Vector2d targetOffset); |
+ |
protected: |
TopControlsManager(TopControlsManagerClient* client, |
float top_controls_height); |
@@ -68,11 +68,10 @@ class CC_EXPORT TopControlsManager { |
scoped_ptr<KeyframedFloatAnimationCurve> top_controls_animation_; |
AnimationDirection animation_direction_; |
bool is_overlay_mode_; |
- bool scroll_readjustment_enabled_; |
float controls_top_offset_; |
float content_top_offset_; |
float top_controls_height_; |
- float previous_root_scroll_offset_; |
+ bool in_user_scroll_; |
DISALLOW_COPY_AND_ASSIGN(TopControlsManager); |
}; |