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

Unified Diff: ui/message_center/views/notifier_settings_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/notification_view.cc ('k') | ui/metro_viewer/ime_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/views/notifier_settings_view.cc
diff --git a/ui/message_center/views/notifier_settings_view.cc b/ui/message_center/views/notifier_settings_view.cc
index daff2d458e747e1d2279221217f37c8accc3bacd..2d24a7384da1f4e8b57495cfe506772cc3525121 100644
--- a/ui/message_center/views/notifier_settings_view.cc
+++ b/ui/message_center/views/notifier_settings_view.cc
@@ -295,7 +295,7 @@ NotifierSettingsView::NotifierButton::NotifierButton(
notifier_(notifier),
icon_view_(new views::ImageView()),
name_view_(new views::Label(notifier_->name)),
- checkbox_(new views::Checkbox(string16())),
+ checkbox_(new views::Checkbox(base::string16())),
learn_more_(NULL) {
DCHECK(provider);
DCHECK(notifier);
@@ -581,7 +581,7 @@ void NotifierSettingsView::UpdateContentsView(
if (need_account_switcher) {
const NotifierGroup& active_group = provider_->GetActiveNotifierGroup();
- string16 notifier_group_text = active_group.login_info.empty() ?
+ base::string16 notifier_group_text = active_group.login_info.empty() ?
active_group.name : active_group.login_info;
notifier_group_selector_ =
new views::MenuButton(NULL, notifier_group_text, this, true);
« no previous file with comments | « ui/message_center/views/notification_view.cc ('k') | ui/metro_viewer/ime_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698