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

Unified Diff: chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc

Issue 344026: Add LoadLog to ClientSocket::Connect(). (Closed)
Patch Set: Minor build fixups and fixed mac bug. Created 11 years, 1 month 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 | « chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h ('k') | net/base/load_log_event_type_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
diff --git a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
index 2b8b0cf27c77296e42034c16f1b475ff9cca1fc1..08cf8c863808a46b14dd79ed352b50eb2d2319a5 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_);
}
« no previous file with comments | « chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h ('k') | net/base/load_log_event_type_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698