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

Unified Diff: ui/message_center/notifier_settings.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/notifier_settings.h ('k') | ui/message_center/views/bounded_label.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/notifier_settings.cc
diff --git a/ui/message_center/notifier_settings.cc b/ui/message_center/notifier_settings.cc
index 0e6fe9b0d39c8b6729e7a857441c671e47dbece1..26546118b9e6a7a43f42679fc7a4b27ee9e1efec 100644
--- a/ui/message_center/notifier_settings.cc
+++ b/ui/message_center/notifier_settings.cc
@@ -51,7 +51,7 @@ bool NotifierId::operator<(const NotifierId& other) const {
}
Notifier::Notifier(const NotifierId& notifier_id,
- const string16& name,
+ const base::string16& name,
bool enabled)
: notifier_id(notifier_id),
name(name),
@@ -62,8 +62,8 @@ Notifier::~Notifier() {
}
NotifierGroup::NotifierGroup(const gfx::Image& icon,
- const string16& name,
- const string16& login_info,
+ const base::string16& name,
+ const base::string16& login_info,
size_t index)
: icon(icon), name(name), login_info(login_info), index(index) {}
« no previous file with comments | « ui/message_center/notifier_settings.h ('k') | ui/message_center/views/bounded_label.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698