diff options
author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-15 12:27:03 +0000 |
---|---|---|
committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-15 12:27:03 +0000 |
commit | 1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf (patch) | |
tree | b78be07dbada3ac0f6d2435558e4a6aaba198ffc /net/base | |
parent | ea15e98a9353494df754a11fb49f0e4b8c0d4789 (diff) | |
download | chromium_src-1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf.zip chromium_src-1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf.tar.gz chromium_src-1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf.tar.bz2 |
Large patch set (159 files total) to cleanup the includes.
- Slightly reduce the size of the generated .lib files ~3%.
- Reduce the number of implicit and explicit atl and windows includes. hooray!
- Help incremental build by reducing the number of unnecessary included files.
- Split some template class in two, one base class for the common code and the specialization that inherits from the base class.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r-- | net/base/ev_root_ca_metadata.h | 9 | ||||
-rw-r--r-- | net/base/upload_data.cc | 4 | ||||
-rw-r--r-- | net/base/upload_data_stream.cc | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/net/base/ev_root_ca_metadata.h b/net/base/ev_root_ca_metadata.h index 373d09d..8e83f0c 100644 --- a/net/base/ev_root_ca_metadata.h +++ b/net/base/ev_root_ca_metadata.h @@ -27,11 +27,12 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef NET_BASE_EV_ROOT_CA_METADATA_H__ -#define NET_BASE_EV_ROOT_CA_METADATA_H__ +#ifndef NET_BASE_EV_ROOT_CA_METADATA_H_ +#define NET_BASE_EV_ROOT_CA_METADATA_H_ #include <map> +#include "base/scoped_ptr.h" #include "net/base/x509_certificate.h" template <typename T> @@ -71,9 +72,9 @@ class EVRootCAMetadata { scoped_array<const char*> policy_oids_; int num_policy_oids_; - DISALLOW_EVIL_CONSTRUCTORS(EVRootCAMetadata); + DISALLOW_COPY_AND_ASSIGN(EVRootCAMetadata); }; } // namespace net -#endif // NET_BASE_EV_ROOT_CA_METADATA_H__ +#endif // NET_BASE_EV_ROOT_CA_METADATA_H_ diff --git a/net/base/upload_data.cc b/net/base/upload_data.cc index ec15435..fb0a6fe 100644 --- a/net/base/upload_data.cc +++ b/net/base/upload_data.cc @@ -27,9 +27,11 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "net/base/upload_data.h" + #include <windows.h> -#include "net/base/upload_data.h" +#include "base/logging.h" namespace net { diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc index 18ed05e..154a994 100644 --- a/net/base/upload_data_stream.cc +++ b/net/base/upload_data_stream.cc @@ -29,6 +29,8 @@ #include "net/base/upload_data_stream.h" +#include "base/logging.h" + namespace net { UploadDataStream::UploadDataStream(const UploadData* data) |