| 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_;
|
|
|