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

Unified Diff: ash/system/chromeos/tray_display.cc

Issue 1230243005: Move JoinString to the base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix 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 | « android_webview/native/aw_web_contents_delegate.cc ('k') | ash/system/chromeos/tray_display_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/tray_display.cc
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index 9419b7759e24cb20c23c54350d379e57d0814455..20040eca43852ae0304f74f520b645e8c309a3f3 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -108,7 +108,7 @@ base::string16 GetAllDisplayInfo() {
lines.push_back(GetDisplayInfoLine(id));
}
- return JoinString(lines, '\n');
+ return base::JoinString(lines, base::ASCIIToUTF16("\n"));
}
void OpenSettings() {
« no previous file with comments | « android_webview/native/aw_web_contents_delegate.cc ('k') | ash/system/chromeos/tray_display_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698