summaryrefslogtreecommitdiffstats
path: root/net/disk_cache
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 05:12:33 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 05:12:33 +0000
commita3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e (patch)
treebdd4dac76e6034ef6cf33450e203269a715ea0e6 /net/disk_cache
parent8bc574c57115e9ffd0169f33131c0865997dcb35 (diff)
downloadchromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.zip
chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.gz
chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.bz2
Add FilePath to base namespace.
This updates headers that forward-declare it and a few random places to use the namespace explicitly. There us a using declaration in file_path.h that makes the rest compile, which we can do in future passes. Review URL: https://codereview.chromium.org/12163003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
-rw-r--r--net/disk_cache/cache_util.h11
-rw-r--r--net/disk_cache/disk_cache.h6
-rw-r--r--net/disk_cache/file.h2
-rw-r--r--net/disk_cache/mapped_file.h4
4 files changed, 15 insertions, 8 deletions
diff --git a/net/disk_cache/cache_util.h b/net/disk_cache/cache_util.h
index 6987dc3..0b3ee6e 100644
--- a/net/disk_cache/cache_util.h
+++ b/net/disk_cache/cache_util.h
@@ -8,7 +8,9 @@
#include "base/basictypes.h"
#include "net/base/net_export.h"
+namespace base {
class FilePath;
+}
namespace disk_cache {
@@ -18,15 +20,16 @@ namespace disk_cache {
// for the cache directory. Returns true if successful. On ChromeOS,
// this moves the cache contents, and leaves the empty cache
// directory.
-NET_EXPORT_PRIVATE bool MoveCache(const FilePath& from_path,
- const FilePath& to_path);
+NET_EXPORT_PRIVATE bool MoveCache(const base::FilePath& from_path,
+ const base::FilePath& to_path);
// Deletes the cache files stored on |path|, and optionally also attempts to
// delete the folder itself.
-NET_EXPORT_PRIVATE void DeleteCache(const FilePath& path, bool remove_folder);
+NET_EXPORT_PRIVATE void DeleteCache(const base::FilePath& path,
+ bool remove_folder);
// Deletes a cache file.
-NET_EXPORT_PRIVATE bool DeleteCacheFile(const FilePath& name);
+NET_EXPORT_PRIVATE bool DeleteCacheFile(const base::FilePath& name);
} // namespace disk_cache
diff --git a/net/disk_cache/disk_cache.h b/net/disk_cache/disk_cache.h
index d2e01a0..e27d24c 100644
--- a/net/disk_cache/disk_cache.h
+++ b/net/disk_cache/disk_cache.h
@@ -17,9 +17,8 @@
#include "net/base/completion_callback.h"
#include "net/base/net_export.h"
-class FilePath;
-
namespace base {
+class FilePath;
class MessageLoopProxy;
}
@@ -48,7 +47,8 @@ class Backend;
// be invoked when a backend is available or a fatal error condition is reached.
// The pointer to receive the |backend| must remain valid until the operation
// completes (the callback is notified).
-NET_EXPORT int CreateCacheBackend(net::CacheType type, const FilePath& path,
+NET_EXPORT int CreateCacheBackend(net::CacheType type,
+ const base::FilePath& path,
int max_bytes, bool force,
base::MessageLoopProxy* thread,
net::NetLog* net_log, Backend** backend,
diff --git a/net/disk_cache/file.h b/net/disk_cache/file.h
index 0124090..3f17ea0 100644
--- a/net/disk_cache/file.h
+++ b/net/disk_cache/file.h
@@ -11,7 +11,9 @@
#include "base/platform_file.h"
#include "net/base/net_export.h"
+namespace base {
class FilePath;
+}
namespace disk_cache {
diff --git a/net/disk_cache/mapped_file.h b/net/disk_cache/mapped_file.h
index c5960d0..6190997 100644
--- a/net/disk_cache/mapped_file.h
+++ b/net/disk_cache/mapped_file.h
@@ -12,7 +12,9 @@
#include "net/disk_cache/file.h"
#include "net/disk_cache/file_block.h"
+namespace base {
class FilePath;
+}
namespace disk_cache {
@@ -27,7 +29,7 @@ class NET_EXPORT_PRIVATE MappedFile : public File {
// Performs object initialization. name is the file to use, and size is the
// amount of data to memory map from the file. If size is 0, the whole file
// will be mapped in memory.
- void* Init(const FilePath& name, size_t size);
+ void* Init(const base::FilePath& name, size_t size);
void* buffer() const {
return buffer_;