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

Unified Diff: extensions/common/api/sockets/sockets_manifest_permission.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 | « extensions/browser/updater/manifest_fetch_data.cc ('k') | extensions/common/csp_validator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/api/sockets/sockets_manifest_permission.cc
diff --git a/extensions/common/api/sockets/sockets_manifest_permission.cc b/extensions/common/api/sockets/sockets_manifest_permission.cc
index 0f7613e0d13836b068dc52bc0031df7522dc8cb5..6dbd4fc311c29cb8f073b8b31f9ef7561689bece 100644
--- a/extensions/common/api/sockets/sockets_manifest_permission.cc
+++ b/extensions/common/api/sockets/sockets_manifest_permission.cc
@@ -131,9 +131,9 @@ void AddSubdomainHostMessage(const SocketPermissionEntrySet& sockets,
messages->push_back(PermissionMessage(
PermissionMessage::kSocketDomainHosts,
l10n_util::GetStringFUTF16(
- id, JoinString(std::vector<base::string16>(domains.begin(),
- domains.end()),
- ' '))));
+ id, base::JoinString(std::vector<base::string16>(domains.begin(),
+ domains.end()),
+ base::ASCIIToUTF16(" ")))));
}
if (ids) {
for (const auto& domain : domains)
@@ -163,9 +163,9 @@ void AddSpecificHostMessage(const SocketPermissionEntrySet& sockets,
messages->push_back(PermissionMessage(
PermissionMessage::kSocketSpecificHosts,
l10n_util::GetStringFUTF16(
- id, JoinString(std::vector<base::string16>(hostnames.begin(),
- hostnames.end()),
- ' '))));
+ id, base::JoinString(std::vector<base::string16>(
+ hostnames.begin(), hostnames.end()),
+ base::ASCIIToUTF16(" ")))));
}
if (ids) {
for (const auto& hostname : hostnames)
« no previous file with comments | « extensions/browser/updater/manifest_fetch_data.cc ('k') | extensions/common/csp_validator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698