diff options
Diffstat (limited to 'net/socket/socks5_client_socket.cc')
| -rw-r--r-- | net/socket/socks5_client_socket.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc index f73b558..c6600a3 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc @@ -64,7 +64,14 @@ SOCKS5ClientSocket::~SOCKS5ClientSocket() { Disconnect(); } -int SOCKS5ClientSocket::Connect(CompletionCallback* callback) { +#ifdef ANDROID +// TODO(kristianm): Find out if Connect should block +#endif +int SOCKS5ClientSocket::Connect(CompletionCallback* callback +#ifdef ANDROID + , bool wait_for_connect +#endif + ) { DCHECK(transport_.get()); DCHECK(transport_->socket()); DCHECK_EQ(STATE_NONE, next_state_); |