| Index: ui/views/controls/slider.h
|
| diff --git a/ui/views/controls/slider.h b/ui/views/controls/slider.h
|
| index e6a521a8580ccb991eb9d91dd5c9b4afb9c2c5a8..22b1f127be6cf3acd25e43113994791330b260b8 100644
|
| --- a/ui/views/controls/slider.h
|
| +++ b/ui/views/controls/slider.h
|
| @@ -53,7 +53,7 @@ class VIEWS_EXPORT Slider : public View, public gfx::AnimationDelegate {
|
| };
|
|
|
| Slider(SliderListener* listener, Orientation orientation);
|
| - virtual ~Slider();
|
| + ~Slider() override;
|
|
|
| float value() const { return value_; }
|
| void SetValue(float value);
|
| @@ -94,21 +94,21 @@ class VIEWS_EXPORT Slider : public View, public gfx::AnimationDelegate {
|
| void OnSliderDragEnded();
|
|
|
| // views::View overrides:
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual void OnPaint(gfx::Canvas* canvas) override;
|
| - virtual bool OnMousePressed(const ui::MouseEvent& event) override;
|
| - virtual bool OnMouseDragged(const ui::MouseEvent& event) override;
|
| - virtual void OnMouseReleased(const ui::MouseEvent& event) override;
|
| - virtual bool OnKeyPressed(const ui::KeyEvent& event) override;
|
| - virtual void GetAccessibleState(ui::AXViewState* state) override;
|
| - virtual void OnFocus() override;
|
| - virtual void OnBlur() override;
|
| + gfx::Size GetPreferredSize() const override;
|
| + void OnPaint(gfx::Canvas* canvas) override;
|
| + bool OnMousePressed(const ui::MouseEvent& event) override;
|
| + bool OnMouseDragged(const ui::MouseEvent& event) override;
|
| + void OnMouseReleased(const ui::MouseEvent& event) override;
|
| + bool OnKeyPressed(const ui::KeyEvent& event) override;
|
| + void GetAccessibleState(ui::AXViewState* state) override;
|
| + void OnFocus() override;
|
| + void OnBlur() override;
|
|
|
| // ui::EventHandler overrides:
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
| + void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| // gfx::AnimationDelegate overrides:
|
| - virtual void AnimationProgressed(const gfx::Animation* animation) override;
|
| + void AnimationProgressed(const gfx::Animation* animation) override;
|
|
|
| void set_listener(SliderListener* listener) {
|
| listener_ = listener;
|
|
|