summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/notifier
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-02 23:25:19 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-02 23:25:19 +0000
commit5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf (patch)
tree4f39f1f44be3eb179f8368bca0bc18512e398a40 /chrome/browser/sync/notifier
parentf852667f469ea8fd31b8a1dd0f0130382efe591f (diff)
downloadchromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.zip
chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.tar.gz
chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.tar.bz2
Add LoadLog to ClientSocket::Connect().
TODO: Use LoadLog in FLIP code. Review URL: http://codereview.chromium.org/344026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/notifier')
-rwxr-xr-xchrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc5
-rwxr-xr-xchrome/browser/sync/notifier/communicator/ssl_socket_adapter.h7
2 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
index 2b8b0cf..08cf8c8 100755
--- a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
+++ b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
@@ -79,7 +79,7 @@ int SSLSocketAdapter::StartSSL(const char* hostname, bool restartable) {
net::ClientSocketFactory::GetDefaultFactory()->CreateSSLClientSocket(
socket_, hostname, ssl_config));
- int result = ssl_socket_->Connect(&connected_callback_);
+ int result = ssl_socket_->Connect(&connected_callback_, NULL);
if (result == net::ERR_IO_PENDING || result == net::OK) {
return 0;
@@ -197,7 +197,8 @@ TransportSocket::TransportSocket(talk_base::AsyncSocket* socket,
socket_->SignalConnectEvent.connect(this, &TransportSocket::OnConnectEvent);
}
-int TransportSocket::Connect(net::CompletionCallback* callback) {
+int TransportSocket::Connect(net::CompletionCallback* callback,
+ net::LoadLog* /* load_log */) {
connect_callback_ = callback;
return socket_->Connect(addr_);
}
diff --git a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h
index ab2fcf5..64d6112 100755
--- a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h
+++ b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h
@@ -13,6 +13,10 @@
#include "net/socket/ssl_client_socket.h"
#include "talk/base/asyncsocket.h"
+namespace net {
+class LoadLog;
+} // namespace net
+
namespace notifier {
class SSLSocketAdapter;
@@ -32,7 +36,8 @@ class TransportSocket : public net::ClientSocket, public sigslot::has_slots<> {
// net::ClientSocket implementation
- virtual int Connect(net::CompletionCallback* callback);
+ virtual int Connect(net::CompletionCallback* callback,
+ net::LoadLog* /* load_log */);
virtual void Disconnect();
virtual bool IsConnected() const;
virtual bool IsConnectedAndIdle() const;