net/socket/web_socket_server_socket.cc - Issue 8915024: Retry 114494 - Remove BindStateHolder and have Bind() return a Callback<> object directly."

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: net/socket/web_socket_server_socket.cc

Issue 8915024: Retry 114494 - Remove BindStateHolder and have Bind() return a Callback<> object directly." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 9 years 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: net/socket/web_socket_server_socket.cc

diff --git a/net/socket/web_socket_server_socket.cc b/net/socket/web_socket_server_socket.cc

index 08b7788fbd646893fa58741b2d2ad17758ab1fb6..899bb3e43d14b75c26f6481f046fdbdd228746a1 100644

--- a/net/socket/web_socket_server_socket.cc

+++ b/net/socket/web_socket_server_socket.cc

@@ -321,8 +321,7 @@ class WebSocketServerSocketImpl : public net::WebSocketServerSocket {

phase_ = PHASE_HANDSHAKE;

net::CompletionCallback cb;

if (callback) {

- cb = base::Bind(&net::OldCompletionCallback::Run<int>,

- base::Unretained(callback));

+ cb = base::Bind(&net::OldCompletionCallbackAdapter, callback);

}

pending_reqs_.push_front(PendingReq(

PendingReq::TYPE_READ_METADATA, fill_handshake_buf_.get(),

« no previous file with comments | « net/socket/socket_test_util.cc ('k') | net/spdy/spdy_proxy_client_socket_unittest.cc » ('j') | no next file with comments »