From ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Fri, 8 Aug 2014 14:30:41 +0200 Subject: Update Chromium to beta version 37.0.2062.68 Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi --- chromium/ui/views/controls/slider.h | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'chromium/ui/views/controls/slider.h') diff --git a/chromium/ui/views/controls/slider.h b/chromium/ui/views/controls/slider.h index cec24c2755b..33a760bfd66 100644 --- a/chromium/ui/views/controls/slider.h +++ b/chromium/ui/views/controls/slider.h @@ -18,6 +18,10 @@ class SlideAnimation; namespace views { +namespace test { +class SliderTestApi; +} + class Slider; enum SliderChangeReason { @@ -57,7 +61,7 @@ class VIEWS_EXPORT Slider : public View, public gfx::AnimationDelegate { // Set the delta used for changing the value via keyboard. void SetKeyboardIncrement(float increment); - void SetAccessibleName(const string16& name); + void SetAccessibleName(const base::string16& name); void set_enable_accessibility_events(bool enabled) { accessibility_events_enabled_ = enabled; @@ -69,6 +73,8 @@ class VIEWS_EXPORT Slider : public View, public gfx::AnimationDelegate { void UpdateState(bool control_on); private: + friend class test::SliderTestApi; + void SetValueInternal(float value, SliderChangeReason reason); // Should be called on the Mouse Down event. Used to calculate relative @@ -81,14 +87,22 @@ class VIEWS_EXPORT Slider : public View, public gfx::AnimationDelegate { void OnPaintFocus(gfx::Canvas* canvas); + // Notify the listener_, if not NULL, that dragging started. + void OnSliderDragStarted(); + + // Notify the listener_, if not NULL, that dragging ended. + void OnSliderDragEnded(); + // views::View overrides: - virtual gfx::Size GetPreferredSize() 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::AccessibleViewState* state) 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; @@ -96,6 +110,10 @@ class VIEWS_EXPORT Slider : public View, public gfx::AnimationDelegate { // gfx::AnimationDelegate overrides: virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + void set_listener(SliderListener* listener) { + listener_ = listener; + } + SliderListener* listener_; Orientation orientation_; @@ -105,7 +123,7 @@ class VIEWS_EXPORT Slider : public View, public gfx::AnimationDelegate { float keyboard_increment_; float animating_value_; bool value_is_valid_; - string16 accessible_name_; + base::string16 accessible_name_; bool accessibility_events_enabled_; SkColor focus_border_color_; -- cgit v1.2.3