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

Side by Side Diff: ui/views/controls/slider.h

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/single_split_view.cc ('k') | ui/views/controls/slider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_CONTROLS_SLIDER_H_ 5 #ifndef UI_VIEWS_CONTROLS_SLIDER_H_
6 #define UI_VIEWS_CONTROLS_SLIDER_H_ 6 #define UI_VIEWS_CONTROLS_SLIDER_H_
7 7
8 #include "ui/gfx/animation/animation_delegate.h" 8 #include "ui/gfx/animation/animation_delegate.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 #include "ui/views/views_export.h" 10 #include "ui/views/views_export.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 Slider(SliderListener* listener, Orientation orientation); 51 Slider(SliderListener* listener, Orientation orientation);
52 virtual ~Slider(); 52 virtual ~Slider();
53 53
54 float value() const { return value_; } 54 float value() const { return value_; }
55 void SetValue(float value); 55 void SetValue(float value);
56 56
57 // Set the delta used for changing the value via keyboard. 57 // Set the delta used for changing the value via keyboard.
58 void SetKeyboardIncrement(float increment); 58 void SetKeyboardIncrement(float increment);
59 59
60 void SetAccessibleName(const string16& name); 60 void SetAccessibleName(const base::string16& name);
61 61
62 void set_enable_accessibility_events(bool enabled) { 62 void set_enable_accessibility_events(bool enabled) {
63 accessibility_events_enabled_ = enabled; 63 accessibility_events_enabled_ = enabled;
64 } 64 }
65 65
66 void set_focus_border_color(SkColor color) { focus_border_color_ = color; } 66 void set_focus_border_color(SkColor color) { focus_border_color_ = color; }
67 67
68 // Update UI based on control on/off state. 68 // Update UI based on control on/off state.
69 void UpdateState(bool control_on); 69 void UpdateState(bool control_on);
70 70
(...skipping 27 matching lines...) Expand all
98 98
99 SliderListener* listener_; 99 SliderListener* listener_;
100 Orientation orientation_; 100 Orientation orientation_;
101 101
102 scoped_ptr<gfx::SlideAnimation> move_animation_; 102 scoped_ptr<gfx::SlideAnimation> move_animation_;
103 103
104 float value_; 104 float value_;
105 float keyboard_increment_; 105 float keyboard_increment_;
106 float animating_value_; 106 float animating_value_;
107 bool value_is_valid_; 107 bool value_is_valid_;
108 string16 accessible_name_; 108 base::string16 accessible_name_;
109 bool accessibility_events_enabled_; 109 bool accessibility_events_enabled_;
110 SkColor focus_border_color_; 110 SkColor focus_border_color_;
111 111
112 // Relative position of the mouse cursor (or the touch point) on the slider's 112 // Relative position of the mouse cursor (or the touch point) on the slider's
113 // button. 113 // button.
114 gfx::Point initial_button_offset_; 114 gfx::Point initial_button_offset_;
115 115
116 const int* bar_active_images_; 116 const int* bar_active_images_;
117 const int* bar_disabled_images_; 117 const int* bar_disabled_images_;
118 const gfx::ImageSkia* thumb_; 118 const gfx::ImageSkia* thumb_;
119 const gfx::ImageSkia* images_[4]; 119 const gfx::ImageSkia* images_[4];
120 int bar_height_; 120 int bar_height_;
121 121
122 DISALLOW_COPY_AND_ASSIGN(Slider); 122 DISALLOW_COPY_AND_ASSIGN(Slider);
123 }; 123 };
124 124
125 } // namespace views 125 } // namespace views
126 126
127 #endif // UI_VIEWS_CONTROLS_SLIDER_H_ 127 #endif // UI_VIEWS_CONTROLS_SLIDER_H_
OLDNEW
« no previous file with comments | « ui/views/controls/single_split_view.cc ('k') | ui/views/controls/slider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698