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

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

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 | « 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 a5907f9a323c5f377aa4c0f4fcb50528323a81f1..3df79272b9f2efa4880a931ef96130dec8613fa6 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -107,7 +107,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