Chromium Code Reviews| 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..6cb6ab9e88ea29fa6d750679bbf1e2dd08bfdf7a 100644 |
| --- a/ui/views/controls/md_slider.h |
| +++ b/ui/views/controls/md_slider.h |
| @@ -10,10 +10,14 @@ |
| #include "ui/views/view.h" |
| #include "ui/views/views_export.h" |
| +namespace gfx { |
| +class SlideAnimation; |
| +} |
| + |
| namespace views { |
| // TODO(yiyix): When material design is enabled by default, use |
| -// MaterialDesignSlider as the default slider implementation. (crbug.com/614453) |
| +// MdSlider as the default slider implementation. (crbug.com/614453) |
| class VIEWS_EXPORT MdSlider : public Slider { |
| public: |
| explicit MdSlider(SliderListener* listener); |
| @@ -29,10 +33,20 @@ class VIEWS_EXPORT MdSlider : public Slider { |
| protected: |
| // ui::Slider: |
| int GetThumbWidth() override; |
| + void SetHighlighted(bool is_highlighted) override; |
| private: |
| + // gfx::AnimationDelegate: |
| + void AnimationProgressed(const gfx::Animation* animation) override; |
| + void AnimationEnded(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 radius of the thumb's highlight. |
| + float thumb_highlight_radius_; |
| + |
| + std::unique_ptr<gfx::SlideAnimation> highlight_animation_; |
|
sadrul
2016/09/30 02:53:36
DISALLOW_COPY_AND_ASSIGN
yiyix
2016/10/03 16:06:50
Thanks, i also added it to the NonMdSlider class.
|
| }; |
| } // namespace views |