Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: ui/views/controls/slider.h

Issue 9853019: Modify the pure-views slider to reset on ESC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/views/controls/slider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « no previous file | ui/views/controls/slider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698