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

Unified Diff: ash/system/chromeos/tray_display_unittest.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 | « ash/system/chromeos/tray_display.cc ('k') | ash/system/user/button_from_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/tray_display_unittest.cc
diff --git a/ash/system/chromeos/tray_display_unittest.cc b/ash/system/chromeos/tray_display_unittest.cc
index c682c48ebf5ead33086a07c5e9b801e1d302d413..f73f1d1f513ca3038df0a84187aac1611fdeb327 100644
--- a/ash/system/chromeos/tray_display_unittest.cc
+++ b/ash/system/chromeos/tray_display_unittest.cc
@@ -45,7 +45,7 @@ base::string16 GetTooltipText(const base::string16& headline,
IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY,
name2, base::UTF8ToUTF16(data2)));
}
- return JoinString(lines, '\n');
+ return base::JoinString(lines, base::ASCIIToUTF16("\n"));
}
base::string16 GetMirroredTooltipText(const base::string16& headline,
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | ash/system/user/button_from_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698