| Index: ui/views/controls/slider.h
|
| diff --git a/ui/views/controls/slider.h b/ui/views/controls/slider.h
|
| index ba6416f8fa3c6adeb4e4aa8663e288c032cb98bb..a510078e838905cf7380028d7687c288bcc38e16 100644
|
| --- a/ui/views/controls/slider.h
|
| +++ b/ui/views/controls/slider.h
|
| @@ -69,6 +69,7 @@ class VIEWS_EXPORT Slider : public View,
|
| virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
|
| virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE;
|
| virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
|
| + virtual bool AcceleratorPressed(const ui::Accelerator&) OVERRIDE;
|
|
|
| // ui::AnimationDelegate overrides:
|
| virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
|
| @@ -81,8 +82,10 @@ class VIEWS_EXPORT Slider : public View,
|
| float value_;
|
| float keyboard_increment_;
|
| float animating_value_;
|
| + float original_value_;
|
| bool value_is_valid_;
|
| string16 accessible_name_;
|
| + bool esc_was_pressed_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Slider);
|
| };
|
|
|