Index: ui/views/controls/md_slider.h |
diff --git a/ui/views/controls/md_slider.h b/ui/views/controls/md_slider.h |
index d9ceeecf0ca3785f5792e88e933e70acd777d052..28d016ebe5ae13aa22e09b5c5543e461c267bd3b 100644 |
--- a/ui/views/controls/md_slider.h |
+++ b/ui/views/controls/md_slider.h |
@@ -6,6 +6,7 @@ |
#define UI_VIEWS_CONTROLS_MD_SLIDER_H_ |
#include "base/macros.h" |
+#include "ui/gfx/animation/animation_delegate.h" |
bruthig
2016/09/21 00:27:46
nit: You shouldn't need to include this since slid
yiyix
2016/09/21 15:20:52
Done.
|
#include "ui/views/controls/slider.h" |
#include "ui/views/view.h" |
#include "ui/views/views_export.h" |
@@ -29,10 +30,22 @@ class VIEWS_EXPORT MdSlider : public Slider { |
protected: |
// ui::Slider: |
int GetThumbWidth() override; |
+ void SetFocus(bool focus) override; |
private: |
+ // gfx::AnimationDelegate: |
+ void AnimationProgressed(const gfx::Animation* animation) override; |
+ |
// Record whether the slider is in the active state or the disabled state. |
bool is_active_; |
+ |
+ // Animating value of the current stroke size of the thumb's highlight. |
+ float animating_thumb_value_; |
+ |
+ // The desired value of stroke of the thumb's highlight. |
+ float value_; |
bruthig
2016/09/21 00:27:46
The variable name |highlight_radius_| would be mor
yiyix
2016/09/21 15:20:52
Done.
|
+ |
+ std::unique_ptr<gfx::SlideAnimation> highlight_animation_; |
bruthig
2016/09/21 00:27:46
nit: You should forward declare SlideAnimation.
yiyix
2016/09/21 15:20:52
Done.
|
}; |
} // namespace views |