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

Unified Diff: net/http/http_proxy_client_socket.h

Issue 8801004: base::Bind: Convert StreamSocket::Connect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes 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
« no previous file with comments | « net/curvecp/curvecp_client_socket.cc ('k') | net/http/http_proxy_client_socket.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_proxy_client_socket.h
diff --git a/net/http/http_proxy_client_socket.h b/net/http/http_proxy_client_socket.h
index 70db3707f7c3f2d7163e2af60555e5d242e02e76..15baf7c09e985de0a46a8e0751a680543759807a 100644
--- a/net/http/http_proxy_client_socket.h
+++ b/net/http/http_proxy_client_socket.h
@@ -60,8 +60,9 @@ class HttpProxyClientSocket : public ProxyClientSocket {
virtual int RestartWithAuth(OldCompletionCallback* callback) OVERRIDE;
virtual const scoped_refptr<HttpAuthController>& auth_controller() OVERRIDE;
- // StreamSocket methods:
+ // StreamSocket implementation.
virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
+ virtual int Connect(const CompletionCallback& callback) OVERRIDE;
virtual void Disconnect() OVERRIDE;
virtual bool IsConnected() const OVERRIDE;
virtual bool IsConnectedAndIdle() const OVERRIDE;
@@ -126,7 +127,8 @@ class HttpProxyClientSocket : public ProxyClientSocket {
State next_state_;
// Stores the callback to the layer above, called on completing Connect().
- OldCompletionCallback* user_callback_;
+ OldCompletionCallback* old_user_callback_;
+ CompletionCallback user_callback_;
HttpRequestInfo request_;
HttpResponseInfo response_;
« no previous file with comments | « net/curvecp/curvecp_client_socket.cc ('k') | net/http/http_proxy_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698