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

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

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 months 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/gl/gl_implementation.cc ('k') | ui/message_center/views/bounded_label.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/cocoa/notification_controller.mm
diff --git a/ui/message_center/cocoa/notification_controller.mm b/ui/message_center/cocoa/notification_controller.mm
index f9266a2bb24cb64e95cdea9a8ca925a600a6566c..1b4e96a0ce1ecb1a05f0b1e43271e350a26a667d 100644
--- a/ui/message_center/cocoa/notification_controller.mm
+++ b/ui/message_center/cocoa/notification_controller.mm
@@ -883,7 +883,8 @@
}
*actualLines = wrapped.size();
- return lines == 1 ? wrapped[0] : JoinString(wrapped, '\n');
+ return lines == 1 ? wrapped[0]
+ : base::JoinString(wrapped, base::ASCIIToUTF16("\n"));
}
- (base::string16)wrapText:(const base::string16&)text
« no previous file with comments | « ui/gl/gl_implementation.cc ('k') | ui/message_center/views/bounded_label.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698