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

Unified Diff: net/websockets/websocket_basic_handshake_stream.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 | « media/capture/capture_resolution_chooser.cc ('k') | remoting/base/capabilities.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_basic_handshake_stream.cc
diff --git a/net/websockets/websocket_basic_handshake_stream.cc b/net/websockets/websocket_basic_handshake_stream.cc
index 616dbb1d0f79f14741b6816145af384ef896bf0c..a253e2e49f4a13d31bdd935de7b1625f426136b2 100644
--- a/net/websockets/websocket_basic_handshake_stream.cc
+++ b/net/websockets/websocket_basic_handshake_stream.cc
@@ -99,7 +99,7 @@ void AddVectorHeaderIfNonEmpty(const char* name,
HttpRequestHeaders* headers) {
if (value.empty())
return;
- headers->SetHeader(name, JoinString(value, ", "));
+ headers->SetHeader(name, base::JoinString(value, ", "));
}
GetHeaderResult GetSingleHeaderValue(const HttpResponseHeaders* headers,
@@ -346,7 +346,7 @@ bool ValidateExtensions(const HttpResponseHeaders* headers,
}
}
}
- *accepted_extensions_descriptor = JoinString(header_values, ", ");
+ *accepted_extensions_descriptor = base::JoinString(header_values, ", ");
return true;
}
« no previous file with comments | « media/capture/capture_resolution_chooser.cc ('k') | remoting/base/capabilities.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698