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

Side by Side Diff: net/base/upload_data_stream.h

Issue 2657005: Get rid of DISALLOW_EVIL_CONSTRUCTORS macro usage in our code base. (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: added the macro back Created 10 years, 6 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/base/telnet_server.h ('k') | net/disk_cache/backend_impl.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_BASE_UPLOAD_DATA_STREAM_H_ 5 #ifndef NET_BASE_UPLOAD_DATA_STREAM_H_
6 #define NET_BASE_UPLOAD_DATA_STREAM_H_ 6 #define NET_BASE_UPLOAD_DATA_STREAM_H_
7 7
8 #include "net/base/file_stream.h" 8 #include "net/base/file_stream.h"
9 #include "net/base/upload_data.h" 9 #include "net/base/upload_data.h"
10 10
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // if the next element is of TYPE_FILE. 76 // if the next element is of TYPE_FILE.
77 uint64 next_element_remaining_; 77 uint64 next_element_remaining_;
78 78
79 // Size and current read position within the stream. 79 // Size and current read position within the stream.
80 uint64 total_size_; 80 uint64 total_size_;
81 uint64 current_position_; 81 uint64 current_position_;
82 82
83 // Whether there is no data left to read. 83 // Whether there is no data left to read.
84 bool eof_; 84 bool eof_;
85 85
86 DISALLOW_EVIL_CONSTRUCTORS(UploadDataStream); 86 DISALLOW_COPY_AND_ASSIGN(UploadDataStream);
87 }; 87 };
88 88
89 } // namespace net 89 } // namespace net
90 90
91 #endif // NET_BASE_UPLOAD_DATA_STREAM_H_ 91 #endif // NET_BASE_UPLOAD_DATA_STREAM_H_
OLDNEW
« no previous file with comments | « net/base/telnet_server.h ('k') | net/disk_cache/backend_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698