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

Unified Diff: net/ftp/ftp_network_transaction.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 | « net/flip/flip_session.cc ('k') | net/http/http_network_transaction.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ftp/ftp_network_transaction.cc
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index a4d0a734a0087d8a760441bb764565b921349f14..18983102f285cc8ffca206d2f91c97509057063a 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -504,7 +504,7 @@ int FtpNetworkTransaction::DoCtrlResolveHostComplete(int result) {
int FtpNetworkTransaction::DoCtrlConnect() {
next_state_ = STATE_CTRL_CONNECT_COMPLETE;
ctrl_socket_.reset(socket_factory_->CreateTCPClientSocket(addresses_));
- return ctrl_socket_->Connect(&io_callback_);
+ return ctrl_socket_->Connect(&io_callback_, load_log_);
}
int FtpNetworkTransaction::DoCtrlConnectComplete(int result) {
@@ -1062,7 +1062,7 @@ int FtpNetworkTransaction::DoDataConnect() {
data_addresses.Copy(addresses_.head());
data_addresses.SetPort(data_connection_port_);
data_socket_.reset(socket_factory_->CreateTCPClientSocket(data_addresses));
- return data_socket_->Connect(&io_callback_);
+ return data_socket_->Connect(&io_callback_, load_log_);
}
int FtpNetworkTransaction::DoDataConnectComplete(int result) {
« no previous file with comments | « net/flip/flip_session.cc ('k') | net/http/http_network_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698