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

Unified Diff: ui/message_center/views/group_view.cc

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/views/group_view.h ('k') | ui/message_center/views/message_center_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/views/group_view.cc
diff --git a/ui/message_center/views/group_view.cc b/ui/message_center/views/group_view.cc
index 64c5d73876f10841c4be52ee41f417d7ce8f964c..3b4d7c54015cad37d23716fde26d798a40227653 100644
--- a/ui/message_center/views/group_view.cc
+++ b/ui/message_center/views/group_view.cc
@@ -78,7 +78,7 @@ GroupView::GroupView(MessageCenterController* controller,
context_message_view_(NULL),
icon_view_(NULL)
{
- std::vector<string16> accessible_lines;
+ std::vector<base::string16> accessible_lines;
// Create the top_view_, which collects into a vertical box all content
// at the top of the notification (to the right of the icon) except for the
// close button.
@@ -96,7 +96,7 @@ GroupView::GroupView(MessageCenterController* controller,
int padding = kTitleLineHeight - font_list.GetHeight();
title_view_ = new BoundedLabel(
- gfx::TruncateString(string16(last_notification.title()),
+ gfx::TruncateString(base::string16(last_notification.title()),
kTitleCharacterLimit),
font_list);
accessible_lines.push_back(last_notification.title());
@@ -155,7 +155,7 @@ GroupView::GroupView(MessageCenterController* controller,
1, 0, 0, 0, kButtonSeparatorColor));
bottom_view_->AddChildView(separator);
more_button_ = new NotificationButton(this);
- string16 button_title =
+ base::string16 button_title =
l10n_util::GetStringFUTF16(IDS_MESSAGE_CENTER_MORE_FROM,
base::IntToString16(group_size_),
display_source_);
« no previous file with comments | « ui/message_center/views/group_view.h ('k') | ui/message_center/views/message_center_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698