Index: cc/top_controls_manager.h |
diff --git a/cc/top_controls_manager.h b/cc/top_controls_manager.h |
index a6900038625d1a38964a44812612dfa8894a80b4..5c3eced19e4e5944365a0183ef9202b0c122d7c7 100644 |
--- a/cc/top_controls_manager.h |
+++ b/cc/top_controls_manager.h |
@@ -30,8 +30,11 @@ class CC_EXPORT TopControlsManager { |
HIDING_CONTROLS |
}; |
- static scoped_ptr<TopControlsManager> Create(TopControlsManagerClient* client, |
- float top_controls_height); |
+ static scoped_ptr<TopControlsManager> Create( |
+ TopControlsManagerClient* client, |
+ float top_controls_height, |
+ float top_controls_show_threshold, |
+ float top_controls_hide_threshold); |
virtual ~TopControlsManager(); |
float controls_top_offset() { return controls_top_offset_; } |
@@ -52,7 +55,9 @@ class CC_EXPORT TopControlsManager { |
protected: |
TopControlsManager(TopControlsManagerClient* client, |
- float top_controls_height); |
+ float top_controls_height, |
+ float top_controls_show_threshold, |
+ float top_controls_hide_threshold); |
private: |
gfx::Vector2dF ScrollInternal(const gfx::Vector2dF pending_delta); |
@@ -67,6 +72,8 @@ class CC_EXPORT TopControlsManager { |
scoped_ptr<KeyframedFloatAnimationCurve> top_controls_animation_; |
AnimationDirection animation_direction_; |
+ float top_controls_show_threshold_; |
+ float top_controls_hide_threshold_; |
Ted C
2013/02/07 00:40:26
I would put the floats below with the other ones.
David Trainor- moved to gerrit
2013/02/11 19:38:28
Done.
|
bool is_overlay_mode_; |
bool in_scroll_gesture_; |
float controls_top_offset_; |
@@ -74,6 +81,7 @@ class CC_EXPORT TopControlsManager { |
float top_controls_height_; |
float previous_root_scroll_offset_; |
float scroll_start_offset_; |
+ float current_scroll_delta_; |
DISALLOW_COPY_AND_ASSIGN(TopControlsManager); |
}; |