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

Unified Diff: net/socket/client_socket_handle.h

Issue 8990001: base::Bind: Convert most of net/http. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clang. 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/client_socket_handle.h
diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h
index 003730c07bbdd6ec6abe1257db51563a7b51e540..c180832b1a4c46ab9040af49318205e0e6b94682 100644
--- a/net/socket/client_socket_handle.h
+++ b/net/socket/client_socket_handle.h
@@ -172,7 +172,7 @@ class NET_EXPORT ClientSocketHandle {
scoped_ptr<StreamSocket> socket_;
std::string group_name_;
bool is_reused_;
- OldCompletionCallbackImpl<ClientSocketHandle> callback_;
+ CompletionCallback callback_;
CompletionCallback user_callback_;
base::TimeDelta idle_time_;
int pool_id_; // See ClientSocketPool::ReleaseSocket() for an explanation.
@@ -208,7 +208,7 @@ int ClientSocketHandle::Init(const std::string& group_name,
group_name_ = group_name;
init_time_ = base::TimeTicks::Now();
int rv = pool_->RequestSocket(
- group_name, &socket_params, priority, this, &callback_, net_log);
+ group_name, &socket_params, priority, this, callback_, net_log);
if (rv == ERR_IO_PENDING) {
user_callback_ = callback;
} else {

Powered by Google App Engine
This is Rietveld 408576698