content/browser/renderer_host/websocket_host.cc - Issue 1223153003: Move JoinString to the base namespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/websocket_host.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:

Index: content/browser/renderer_host/websocket_host.cc

diff --git a/content/browser/renderer_host/websocket_host.cc b/content/browser/renderer_host/websocket_host.cc

index 8d0046bcc4d115629759b72fabf43e832463d80f..3c89b5ca0582395a01fa715990642e15b4ae9716 100644

--- a/content/browser/renderer_host/websocket_host.cc

+++ b/content/browser/renderer_host/websocket_host.cc

@@ -353,7 +353,7 @@ void WebSocketHost::OnAddChannelRequest(

DVLOG(3) << "WebSocketHost::OnAddChannelRequest"

<< " routing_id=" << routing_id_ << " socket_url=\"" << socket_url

<< "\" requested_protocols=\""

- << JoinString(requested_protocols, ", ") << "\" origin=\""

+ << base::JoinString(requested_protocols, ", ") << "\" origin=\""

<< origin.string() << "\"";

DCHECK(!channel_);