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

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

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment Created 6 years, 2 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
« no previous file with comments | « net/ftp/ftp_network_layer.h ('k') | net/ftp/ftp_network_transaction_unittest.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
(...skipping 20 matching lines...) Expand all
31 FtpNetworkTransaction(FtpNetworkSession* session, 31 FtpNetworkTransaction(FtpNetworkSession* session,
32 ClientSocketFactory* socket_factory); 32 ClientSocketFactory* socket_factory);
33 virtual ~FtpNetworkTransaction(); 33 virtual ~FtpNetworkTransaction();
34 34
35 virtual int Stop(int error); 35 virtual int Stop(int error);
36 virtual int RestartIgnoringLastError(const CompletionCallback& callback); 36 virtual int RestartIgnoringLastError(const CompletionCallback& callback);
37 37
38 // FtpTransaction methods: 38 // FtpTransaction methods:
39 virtual int Start(const FtpRequestInfo* request_info, 39 virtual int Start(const FtpRequestInfo* request_info,
40 const CompletionCallback& callback, 40 const CompletionCallback& callback,
41 const BoundNetLog& net_log) OVERRIDE; 41 const BoundNetLog& net_log) override;
42 virtual int RestartWithAuth(const AuthCredentials& credentials, 42 virtual int RestartWithAuth(const AuthCredentials& credentials,
43 const CompletionCallback& callback) OVERRIDE; 43 const CompletionCallback& callback) override;
44 virtual int Read(IOBuffer* buf, int buf_len, 44 virtual int Read(IOBuffer* buf, int buf_len,
45 const CompletionCallback& callback) OVERRIDE; 45 const CompletionCallback& callback) override;
46 virtual const FtpResponseInfo* GetResponseInfo() const OVERRIDE; 46 virtual const FtpResponseInfo* GetResponseInfo() const override;
47 virtual LoadState GetLoadState() const OVERRIDE; 47 virtual LoadState GetLoadState() const override;
48 virtual uint64 GetUploadProgress() const OVERRIDE; 48 virtual uint64 GetUploadProgress() const override;
49 49
50 private: 50 private:
51 FRIEND_TEST_ALL_PREFIXES(FtpNetworkTransactionTest, 51 FRIEND_TEST_ALL_PREFIXES(FtpNetworkTransactionTest,
52 DownloadTransactionEvilPasvUnsafeHost); 52 DownloadTransactionEvilPasvUnsafeHost);
53 53
54 enum Command { 54 enum Command {
55 COMMAND_NONE, 55 COMMAND_NONE,
56 COMMAND_USER, 56 COMMAND_USER,
57 COMMAND_PASS, 57 COMMAND_PASS,
58 COMMAND_SYST, 58 COMMAND_SYST,
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 253
254 State next_state_; 254 State next_state_;
255 255
256 // State to switch to after data connection is complete. 256 // State to switch to after data connection is complete.
257 State state_after_data_connect_complete_; 257 State state_after_data_connect_complete_;
258 }; 258 };
259 259
260 } // namespace net 260 } // namespace net
261 261
262 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_ 262 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_
OLDNEW
« no previous file with comments | « net/ftp/ftp_network_layer.h ('k') | net/ftp/ftp_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698