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

Unified Diff: ui/message_center/cocoa/settings_controller.mm

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
Index: ui/message_center/cocoa/settings_controller.mm
diff --git a/ui/message_center/cocoa/settings_controller.mm b/ui/message_center/cocoa/settings_controller.mm
index 82f2c46188fe008b6e3c3476bab78d8d4aa7028e..1f8e2045171916b1d3c0b48da0ff2894efef5c51 100644
--- a/ui/message_center/cocoa/settings_controller.mm
+++ b/ui/message_center/cocoa/settings_controller.mm
@@ -192,11 +192,12 @@ void NotifierSettingsObserverMac::NotifierGroupChanged() {
[groupDropDownButton_ setTarget:self];
// Add a dummy item for pull-down.
[groupDropDownButton_ addItemWithTitle:@""];
- string16 title;
+ base::string16 title;
for (size_t i = 0; i < groupCount; ++i) {
const message_center::NotifierGroup& group =
provider_->GetNotifierGroupAt(i);
- string16 item = group.login_info.empty() ? group.name : group.login_info;
+ base::string16 item =
+ group.login_info.empty() ? group.name : group.login_info;
[groupDropDownButton_ addItemWithTitle:base::SysUTF16ToNSString(item)];
if (provider_->IsNotifierGroupActiveAt(i)) {
title = item;
« no previous file with comments | « ui/message_center/cocoa/popup_controller_unittest.mm ('k') | ui/message_center/cocoa/tray_view_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698