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

Side by Side Diff: net/ftp/ftp_network_transaction.h

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 unified diff | Download patch
« no previous file with comments | « net/filter/sdch_filter_unittest.cc ('k') | net/ftp/ftp_network_transaction.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_FTP_FTP_NETWORK_TRANSACTION_H_ 5 #ifndef NET_FTP_FTP_NETWORK_TRANSACTION_H_
6 #define NET_FTP_FTP_NETWORK_TRANSACTION_H_ 6 #define NET_FTP_FTP_NETWORK_TRANSACTION_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
12 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
14 #include "net/base/address_list.h" 15 #include "net/base/address_list.h"
15 #include "net/base/auth.h" 16 #include "net/base/auth.h"
16 #include "net/base/net_log.h" 17 #include "net/base/net_log.h"
17 #include "net/dns/host_resolver.h" 18 #include "net/dns/host_resolver.h"
18 #include "net/dns/single_request_host_resolver.h" 19 #include "net/dns/single_request_host_resolver.h"
19 #include "net/ftp/ftp_ctrl_response_buffer.h" 20 #include "net/ftp/ftp_ctrl_response_buffer.h"
20 #include "net/ftp/ftp_response_info.h" 21 #include "net/ftp/ftp_response_info.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 // Initially we favour EPSV over PASV for transfers but should any 239 // Initially we favour EPSV over PASV for transfers but should any
239 // EPSV fail, we fall back to PASV for the duration of connection. 240 // EPSV fail, we fall back to PASV for the duration of connection.
240 bool use_epsv_; 241 bool use_epsv_;
241 242
242 AuthCredentials credentials_; 243 AuthCredentials credentials_;
243 244
244 // Current directory on the remote server, as returned by last PWD command, 245 // Current directory on the remote server, as returned by last PWD command,
245 // with any trailing slash removed. 246 // with any trailing slash removed.
246 std::string current_remote_directory_; 247 std::string current_remote_directory_;
247 248
248 int data_connection_port_; 249 uint16 data_connection_port_;
249 250
250 ClientSocketFactory* socket_factory_; 251 ClientSocketFactory* socket_factory_;
251 252
252 scoped_ptr<StreamSocket> ctrl_socket_; 253 scoped_ptr<StreamSocket> ctrl_socket_;
253 scoped_ptr<StreamSocket> data_socket_; 254 scoped_ptr<StreamSocket> data_socket_;
254 255
255 State next_state_; 256 State next_state_;
256 257
257 // State to switch to after data connection is complete. 258 // State to switch to after data connection is complete.
258 State state_after_data_connect_complete_; 259 State state_after_data_connect_complete_;
259 }; 260 };
260 261
261 } // namespace net 262 } // namespace net
262 263
263 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_ 264 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_
OLDNEW
« no previous file with comments | « net/filter/sdch_filter_unittest.cc ('k') | net/ftp/ftp_network_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698