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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/single_split_view.cc ('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 cec24c2755bdd994af34c4a6b4443f4a69e19c14..a2a81b55ccaa670e9f4718ff7339bcc6a9dd4d19 100644
--- a/ui/views/controls/slider.h
+++ b/ui/views/controls/slider.h
@@ -57,7 +57,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;
@@ -105,7 +105,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_;
« 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