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

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: 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') | ui/views/controls/slider.cc » ('J')
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 2e7a21fc7b230eb5c704ff67edc6a5ecbb1a4c63..072b7371e3cd80006b5eb7125d7981043e48723f 100644
--- a/ui/views/controls/slider.h
+++ b/ui/views/controls/slider.h
@@ -57,8 +57,10 @@ class VIEWS_EXPORT Slider : public View,
virtual gfx::Size GetPreferredSize() OVERRIDE;
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+ virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
virtual bool OnMouseDragged(const views::MouseEvent& 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;
@@ -70,8 +72,10 @@ class VIEWS_EXPORT Slider : public View,
float value_;
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') | ui/views/controls/slider.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698