Chromium Code Reviews| Index: base/file_util.h |
| diff --git a/base/file_util.h b/base/file_util.h |
| index 3f892e3ad14f9af432852af63ca14a438a1121c4..ee27b2b022161689bc25e142d812930e9d42d5cf 100644 |
| --- a/base/file_util.h |
| +++ b/base/file_util.h |
| @@ -25,9 +25,9 @@ |
| #include "base/base_export.h" |
| #include "base/basictypes.h" |
| +#include "base/files/file.h" |
| #include "base/files/file_path.h" |
| #include "base/memory/scoped_ptr.h" |
| -#include "base/platform_file.h" |
| #include "base/strings/string16.h" |
| #if defined(OS_POSIX) |
| @@ -93,7 +93,7 @@ BASE_EXPORT bool Move(const FilePath& from_path, const FilePath& to_path); |
| // Returns false on failure and sets *error appropriately, if it is non-NULL. |
| BASE_EXPORT bool ReplaceFile(const FilePath& from_path, |
| const FilePath& to_path, |
| - PlatformFileError* error); |
| + File::Error* error); |
| // Copies a single file. Use CopyDirectory to copy directories. |
| // This function fails if either path contains traversal components ('..'). |
| @@ -256,7 +256,7 @@ BASE_EXPORT bool CreateTemporaryDirInDir(const FilePath& base_dir, |
| // Returns true on success, leaving *error unchanged. |
| // Returns false on failure and sets *error appropriately, if it is non-NULL. |
| BASE_EXPORT bool CreateDirectoryAndGetError(const FilePath& full_path, |
| - PlatformFileError* error); |
| + File::Error* error); |
| // Backward-compatible convenience method for the above. |
| BASE_EXPORT bool CreateDirectory(const FilePath& full_path); |
| @@ -292,7 +292,7 @@ BASE_EXPORT bool NormalizeToNativeFilePath(const FilePath& path, |
| BASE_EXPORT bool IsLink(const FilePath& file_path); |
| // Returns information about the given file path. |
| -BASE_EXPORT bool GetFileInfo(const FilePath& file_path, PlatformFileInfo* info); |
| +BASE_EXPORT bool GetFileInfo(const FilePath& file_path, File::Info* info); |
| // Sets the time of the last access and the time of the last modification. |
| BASE_EXPORT bool TouchFile(const FilePath& path, |
| @@ -300,7 +300,7 @@ BASE_EXPORT bool TouchFile(const FilePath& path, |
| const Time& last_modified); |
| // Wrapper for fopen-like calls. Returns non-NULL FILE* on success. |
| -BASE_EXPORT FILE* OpenFile(const FilePath& filename, const char* mode); |
| +BASE_EXPORT FILE* OpenFile(const base::FilePath& filename, const char* mode); |
|
brettw
2014/01/04 21:49:40
I don't think you needed base here.
rvargas (doing something else)
2014/01/06 19:30:06
That was unintended :(. I also removed the one fro
|
| // Closes file opened by OpenFile. Returns true on success. |
| BASE_EXPORT bool CloseFile(FILE* file); |