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

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

Issue 6930014: Rename ClientSocket to StreamSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 months 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 | Annotate | Revision Log
« no previous file with comments | « net/base/net_log_event_type_list.h ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/string16.h" 14 #include "base/string16.h"
15 #include "net/base/address_list.h" 15 #include "net/base/address_list.h"
16 #include "net/base/host_resolver.h" 16 #include "net/base/host_resolver.h"
17 #include "net/base/net_log.h" 17 #include "net/base/net_log.h"
18 #include "net/ftp/ftp_ctrl_response_buffer.h" 18 #include "net/ftp/ftp_ctrl_response_buffer.h"
19 #include "net/ftp/ftp_response_info.h" 19 #include "net/ftp/ftp_response_info.h"
20 #include "net/ftp/ftp_transaction.h" 20 #include "net/ftp/ftp_transaction.h"
21 21
22 namespace net { 22 namespace net {
23 23
24 class ClientSocket;
25 class ClientSocketFactory; 24 class ClientSocketFactory;
26 class FtpNetworkSession; 25 class FtpNetworkSession;
26 class StreamSocket;
27 27
28 class FtpNetworkTransaction : public FtpTransaction { 28 class FtpNetworkTransaction : public FtpTransaction {
29 public: 29 public:
30 FtpNetworkTransaction(FtpNetworkSession* session, 30 FtpNetworkTransaction(FtpNetworkSession* session,
31 ClientSocketFactory* socket_factory); 31 ClientSocketFactory* socket_factory);
32 virtual ~FtpNetworkTransaction(); 32 virtual ~FtpNetworkTransaction();
33 33
34 virtual int Stop(int error); 34 virtual int Stop(int error);
35 virtual int RestartIgnoringLastError(CompletionCallback* callback); 35 virtual int RestartIgnoringLastError(CompletionCallback* callback);
36 36
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 string16 password_; 232 string16 password_;
233 233
234 // Current directory on the remote server, as returned by last PWD command, 234 // Current directory on the remote server, as returned by last PWD command,
235 // with any trailing slash removed. 235 // with any trailing slash removed.
236 std::string current_remote_directory_; 236 std::string current_remote_directory_;
237 237
238 int data_connection_port_; 238 int data_connection_port_;
239 239
240 ClientSocketFactory* socket_factory_; 240 ClientSocketFactory* socket_factory_;
241 241
242 scoped_ptr<ClientSocket> ctrl_socket_; 242 scoped_ptr<StreamSocket> ctrl_socket_;
243 scoped_ptr<ClientSocket> data_socket_; 243 scoped_ptr<StreamSocket> data_socket_;
244 244
245 State next_state_; 245 State next_state_;
246 }; 246 };
247 247
248 } // namespace net 248 } // namespace net
249 249
250 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_ 250 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_
OLDNEW
« no previous file with comments | « net/base/net_log_event_type_list.h ('k') | net/ftp/ftp_network_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698