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

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

Issue 10830027: Implement new slider control and disable the volume control when audio is muted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move enum from .h to .cc. Created 8 years, 5 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 | « ui/resources/ui_resources.grd ('k') | 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 4a69ef90af9d3b7a406600560945c56203e5087c..514325f6150bbca8f27a9a030eb5088e07e8ab5c 100644
--- a/ui/views/controls/slider.h
+++ b/ui/views/controls/slider.h
@@ -11,6 +11,10 @@
typedef unsigned int SkColor;
+namespace gfx {
+class ImageSkia;
+}
+
namespace ui {
class SlideAnimation;
}
@@ -65,6 +69,9 @@ class VIEWS_EXPORT Slider : public View,
void set_focus_border_color(SkColor color) { focus_border_color_ = color; }
+ // Update UI based on control on/off state.
+ void UpdateState(bool control_on);
+
private:
void SetValueInternal(float value, SliderChangeReason reason);
@@ -99,6 +106,12 @@ class VIEWS_EXPORT Slider : public View,
bool accessibility_events_enabled_;
SkColor focus_border_color_;
+ const int* bar_active_images_;
+ const int* bar_disabled_images_;
+ const gfx::ImageSkia* thumb_;
+ const gfx::ImageSkia* images_[4];
+ int bar_height_;
+
DISALLOW_COPY_AND_ASSIGN(Slider);
};
« no previous file with comments | « ui/resources/ui_resources.grd ('k') | ui/views/controls/slider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698