| Index: ui/views/controls/slider.h
|
| diff --git a/ui/views/controls/slider.h b/ui/views/controls/slider.h
|
| index 33a760bfd660a97079a9300383ce297e92bb0227..e6a521a8580ccb991eb9d91dd5c9b4afb9c2c5a8 100644
|
| --- a/ui/views/controls/slider.h
|
| +++ b/ui/views/controls/slider.h
|
| @@ -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;
|
| + 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;
|
|
|
| // ui::EventHandler overrides:
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| // gfx::AnimationDelegate overrides:
|
| - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
|
| + virtual void AnimationProgressed(const gfx::Animation* animation) override;
|
|
|
| void set_listener(SliderListener* listener) {
|
| listener_ = listener;
|
|
|