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

Unified Diff: ui/message_center/views/bounded_label.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/message_center/notifier_settings.cc ('k') | ui/message_center/views/bounded_label.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/views/bounded_label.h
diff --git a/ui/message_center/views/bounded_label.h b/ui/message_center/views/bounded_label.h
index d6b2f49a519a3b6505241cf876cb556cc6e8dae7..c60717703c6bc87e151e728698b0abab8c1cae5a 100644
--- a/ui/message_center/views/bounded_label.h
+++ b/ui/message_center/views/bounded_label.h
@@ -33,8 +33,8 @@ class BoundedLabelTest;
// bounded_label.cc file for details.
class MESSAGE_CENTER_EXPORT BoundedLabel : public views::View {
public:
- BoundedLabel(const string16& text, const gfx::FontList& font_list);
- BoundedLabel(const string16& text);
+ BoundedLabel(const base::string16& text, const gfx::FontList& font_list);
+ BoundedLabel(const base::string16& text);
virtual ~BoundedLabel();
void SetColors(SkColor textColor, SkColor backgroundColor);
@@ -64,7 +64,7 @@ class MESSAGE_CENTER_EXPORT BoundedLabel : public views::View {
private:
friend class test::BoundedLabelTest;
- string16 GetWrappedTextForTest(int width, int lines);
+ base::string16 GetWrappedTextForTest(int width, int lines);
scoped_ptr<InnerBoundedLabel> label_;
int line_limit_;
« no previous file with comments | « ui/message_center/notifier_settings.cc ('k') | ui/message_center/views/bounded_label.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698