| Index: storage/browser/fileapi/native_file_util.h
|
| diff --git a/webkit/browser/fileapi/native_file_util.h b/storage/browser/fileapi/native_file_util.h
|
| similarity index 78%
|
| rename from webkit/browser/fileapi/native_file_util.h
|
| rename to storage/browser/fileapi/native_file_util.h
|
| index bd875814344ddc7bd31ecb62a65460ddb1b58896..662c5d60b710b9eef97354335731f60932524513 100644
|
| --- a/webkit/browser/fileapi/native_file_util.h
|
| +++ b/storage/browser/fileapi/native_file_util.h
|
| @@ -9,14 +9,14 @@
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util_proxy.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "webkit/browser/fileapi/file_system_file_util.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| +#include "storage/browser/fileapi/file_system_file_util.h"
|
| +#include "storage/common/storage_export.h"
|
|
|
| namespace base {
|
| class Time;
|
| }
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
|
|
| // A thin wrapper class for accessing the OS native filesystem.
|
| // This performs common error checks necessary to implement FileUtil family
|
| @@ -24,19 +24,16 @@ namespace fileapi {
|
| //
|
| // For the error checks it performs please see the comment for
|
| // FileSystemFileUtil interface
|
| -// (webkit/browser/fileapi/file_system_file_util.h).
|
| +// (storage/browser/fileapi/file_system_file_util.h).
|
| //
|
| // Note that all the methods of this class are static and this does NOT
|
| // inherit from FileSystemFileUtil.
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE NativeFileUtil {
|
| +class STORAGE_EXPORT_PRIVATE NativeFileUtil {
|
| public:
|
| - enum CopyOrMoveMode {
|
| - COPY_NOSYNC,
|
| - COPY_SYNC,
|
| - MOVE
|
| - };
|
| + enum CopyOrMoveMode { COPY_NOSYNC, COPY_SYNC, MOVE };
|
| static CopyOrMoveMode CopyOrMoveModeForDestination(
|
| - const FileSystemURL& dest_url, bool copy);
|
| + const FileSystemURL& dest_url,
|
| + bool copy);
|
|
|
| static base::File CreateOrOpen(const base::FilePath& path, int file_flags);
|
| static base::File::Error EnsureFileExists(const base::FilePath& path,
|
| @@ -47,13 +44,11 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE NativeFileUtil {
|
| static base::File::Error GetFileInfo(const base::FilePath& path,
|
| base::File::Info* file_info);
|
| static scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>
|
| - CreateFileEnumerator(const base::FilePath& root_path,
|
| - bool recursive);
|
| + CreateFileEnumerator(const base::FilePath& root_path, bool recursive);
|
| static base::File::Error Touch(const base::FilePath& path,
|
| const base::Time& last_access_time,
|
| const base::Time& last_modified_time);
|
| - static base::File::Error Truncate(const base::FilePath& path,
|
| - int64 length);
|
| + static base::File::Error Truncate(const base::FilePath& path, int64 length);
|
| static bool PathExists(const base::FilePath& path);
|
| static bool DirectoryExists(const base::FilePath& path);
|
| static base::File::Error CopyOrMoveFile(
|
| @@ -68,6 +63,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE NativeFileUtil {
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(NativeFileUtil);
|
| };
|
|
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_BROWSER_FILEAPI_NATIVE_FILE_UTIL_H_
|
|
|