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

Unified Diff: content/child/websocket_bridge.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
Index: content/child/websocket_bridge.cc
diff --git a/content/child/websocket_bridge.cc b/content/child/websocket_bridge.cc
index a5cca2454b4660bc510529da1241c87f4d32724a..6893937d9eadb101367d393c2d346e1079627eb2 100644
--- a/content/child/websocket_bridge.cc
+++ b/content/child/websocket_bridge.cc
@@ -220,7 +220,7 @@ void WebSocketBridge::connect(
url::DeprecatedSerializedOrigin origin_to_pass(origin);
DVLOG(1) << "Bridge#" << channel_id_ << " Connect(" << url << ", ("
- << JoinString(protocols_to_pass, ", ") << "), "
+ << base::JoinString(protocols_to_pass, ", ") << "), "
<< origin_to_pass.string() << ")";
ChildThreadImpl::current()->Send(new WebSocketHostMsg_AddChannelRequest(
« no previous file with comments | « content/browser/speech/google_streaming_remote_engine.cc ('k') | extensions/browser/api/bluetooth/bluetooth_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698