diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /net/disk_cache/cache_util.h | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'net/disk_cache/cache_util.h')
| -rw-r--r-- | net/disk_cache/cache_util.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/disk_cache/cache_util.h b/net/disk_cache/cache_util.h index cb78f169..455bf305 100644 --- a/net/disk_cache/cache_util.h +++ b/net/disk_cache/cache_util.h @@ -1,11 +1,10 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #ifndef NET_DISK_CACHE_CACHE_UTIL_H_ #define NET_DISK_CACHE_CACHE_UTIL_H_ - -#include <string> +#pragma once #include "base/basictypes.h" |