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

Unified Diff: ui/views/controls/button/button.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/button/blue_button.cc ('k') | ui/views/controls/button/button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/button.h
diff --git a/ui/views/controls/button/button.h b/ui/views/controls/button/button.h
index d038015f870ab4a7da99f9b3c7f8c4b5c8e10855..75952d243f09795b341eb0613c5a837af7245efc 100644
--- a/ui/views/controls/button/button.h
+++ b/ui/views/controls/button/button.h
@@ -46,16 +46,16 @@ class VIEWS_EXPORT Button : public View {
STYLE_COUNT,
};
- void SetTooltipText(const string16& tooltip_text);
+ void SetTooltipText(const base::string16& tooltip_text);
int tag() const { return tag_; }
void set_tag(int tag) { tag_ = tag; }
- void SetAccessibleName(const string16& name);
+ void SetAccessibleName(const base::string16& name);
// Overridden from View:
virtual bool GetTooltipText(const gfx::Point& p,
- string16* tooltip) const OVERRIDE;
+ base::string16* tooltip) const OVERRIDE;
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
protected:
@@ -72,10 +72,10 @@ class VIEWS_EXPORT Button : public View {
private:
// The text shown in a tooltip.
- string16 tooltip_text_;
+ base::string16 tooltip_text_;
// Accessibility data.
- string16 accessible_name_;
+ base::string16 accessible_name_;
// The id tag associated with this button. Used to disambiguate buttons in
// the ButtonListener implementation.
« no previous file with comments | « ui/views/controls/button/blue_button.cc ('k') | ui/views/controls/button/button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698