Index: storage/browser/fileapi/async_file_util_adapter.h |
diff --git a/webkit/browser/fileapi/async_file_util_adapter.h b/storage/browser/fileapi/async_file_util_adapter.h |
similarity index 34% |
rename from webkit/browser/fileapi/async_file_util_adapter.h |
rename to storage/browser/fileapi/async_file_util_adapter.h |
index 8e90e5d140929e97947808584a2a43fe2fd5751b..f7848e1b62e268d9bde564f23e859c463a7cfa40 100644 |
--- a/webkit/browser/fileapi/async_file_util_adapter.h |
+++ b/storage/browser/fileapi/async_file_util_adapter.h |
@@ -6,9 +6,9 @@ |
#define WEBKIT_BROWSER_FILEAPI_ASYNC_FILE_UTIL_ADAPTER_H_ |
#include "base/memory/scoped_ptr.h" |
-#include "webkit/browser/fileapi/async_file_util.h" |
+#include "storage/browser/fileapi/async_file_util.h" |
-namespace fileapi { |
+namespace storage { |
class FileSystemFileUtil; |
@@ -22,7 +22,7 @@ class FileSystemFileUtil; |
// |
// This instance (as thus this->sync_file_util_) is guaranteed to be alive |
// as far as FileSystemOperationContext given to each operation is kept alive. |
-class WEBKIT_STORAGE_BROWSER_EXPORT AsyncFileUtilAdapter |
+class STORAGE_EXPORT AsyncFileUtilAdapter |
: public NON_EXPORTED_BASE(AsyncFileUtil) { |
public: |
// Creates a new AsyncFileUtil for |sync_file_util|. This takes the |
@@ -33,75 +33,61 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AsyncFileUtilAdapter |
virtual ~AsyncFileUtilAdapter(); |
- FileSystemFileUtil* sync_file_util() { |
- return sync_file_util_.get(); |
- } |
+ FileSystemFileUtil* sync_file_util() { return sync_file_util_.get(); } |
// AsyncFileUtil overrides. |
- virtual void CreateOrOpen( |
- scoped_ptr<FileSystemOperationContext> context, |
- const FileSystemURL& url, |
- int file_flags, |
- const CreateOrOpenCallback& callback) OVERRIDE; |
+ virtual void CreateOrOpen(scoped_ptr<FileSystemOperationContext> context, |
+ const FileSystemURL& url, |
+ int file_flags, |
+ const CreateOrOpenCallback& callback) OVERRIDE; |
virtual void EnsureFileExists( |
scoped_ptr<FileSystemOperationContext> context, |
const FileSystemURL& url, |
const EnsureFileExistsCallback& callback) OVERRIDE; |
- virtual void CreateDirectory( |
- scoped_ptr<FileSystemOperationContext> context, |
- const FileSystemURL& url, |
- bool exclusive, |
- bool recursive, |
- const StatusCallback& callback) OVERRIDE; |
- virtual void GetFileInfo( |
- scoped_ptr<FileSystemOperationContext> context, |
- const FileSystemURL& url, |
- const GetFileInfoCallback& callback) OVERRIDE; |
- virtual void ReadDirectory( |
- scoped_ptr<FileSystemOperationContext> context, |
- const FileSystemURL& url, |
- const ReadDirectoryCallback& callback) OVERRIDE; |
- virtual void Touch( |
- scoped_ptr<FileSystemOperationContext> context, |
- const FileSystemURL& url, |
- const base::Time& last_access_time, |
- const base::Time& last_modified_time, |
- const StatusCallback& callback) OVERRIDE; |
- virtual void Truncate( |
- scoped_ptr<FileSystemOperationContext> context, |
- const FileSystemURL& url, |
- int64 length, |
- const StatusCallback& callback) OVERRIDE; |
- virtual void CopyFileLocal( |
- scoped_ptr<FileSystemOperationContext> context, |
- const FileSystemURL& src_url, |
- const FileSystemURL& dest_url, |
- CopyOrMoveOption option, |
- const CopyFileProgressCallback& progress_callback, |
- const StatusCallback& callback) OVERRIDE; |
- virtual void MoveFileLocal( |
- scoped_ptr<FileSystemOperationContext> context, |
- const FileSystemURL& src_url, |
- const FileSystemURL& dest_url, |
- CopyOrMoveOption option, |
- const StatusCallback& callback) OVERRIDE; |
- virtual void CopyInForeignFile( |
- scoped_ptr<FileSystemOperationContext> context, |
- const base::FilePath& src_file_path, |
- const FileSystemURL& dest_url, |
- const StatusCallback& callback) OVERRIDE; |
- virtual void DeleteFile( |
- scoped_ptr<FileSystemOperationContext> context, |
- const FileSystemURL& url, |
- const StatusCallback& callback) OVERRIDE; |
- virtual void DeleteDirectory( |
- scoped_ptr<FileSystemOperationContext> context, |
- const FileSystemURL& url, |
- const StatusCallback& callback) OVERRIDE; |
- virtual void DeleteRecursively( |
- scoped_ptr<FileSystemOperationContext> context, |
- const FileSystemURL& url, |
- const StatusCallback& callback) OVERRIDE; |
+ virtual void CreateDirectory(scoped_ptr<FileSystemOperationContext> context, |
+ const FileSystemURL& url, |
+ bool exclusive, |
+ bool recursive, |
+ const StatusCallback& callback) OVERRIDE; |
+ virtual void GetFileInfo(scoped_ptr<FileSystemOperationContext> context, |
+ const FileSystemURL& url, |
+ const GetFileInfoCallback& callback) OVERRIDE; |
+ virtual void ReadDirectory(scoped_ptr<FileSystemOperationContext> context, |
+ const FileSystemURL& url, |
+ const ReadDirectoryCallback& callback) OVERRIDE; |
+ virtual void Touch(scoped_ptr<FileSystemOperationContext> context, |
+ const FileSystemURL& url, |
+ const base::Time& last_access_time, |
+ const base::Time& last_modified_time, |
+ const StatusCallback& callback) OVERRIDE; |
+ virtual void Truncate(scoped_ptr<FileSystemOperationContext> context, |
+ const FileSystemURL& url, |
+ int64 length, |
+ const StatusCallback& callback) OVERRIDE; |
+ virtual void CopyFileLocal(scoped_ptr<FileSystemOperationContext> context, |
+ const FileSystemURL& src_url, |
+ const FileSystemURL& dest_url, |
+ CopyOrMoveOption option, |
+ const CopyFileProgressCallback& progress_callback, |
+ const StatusCallback& callback) OVERRIDE; |
+ virtual void MoveFileLocal(scoped_ptr<FileSystemOperationContext> context, |
+ const FileSystemURL& src_url, |
+ const FileSystemURL& dest_url, |
+ CopyOrMoveOption option, |
+ const StatusCallback& callback) OVERRIDE; |
+ virtual void CopyInForeignFile(scoped_ptr<FileSystemOperationContext> context, |
+ const base::FilePath& src_file_path, |
+ const FileSystemURL& dest_url, |
+ const StatusCallback& callback) OVERRIDE; |
+ virtual void DeleteFile(scoped_ptr<FileSystemOperationContext> context, |
+ const FileSystemURL& url, |
+ const StatusCallback& callback) OVERRIDE; |
+ virtual void DeleteDirectory(scoped_ptr<FileSystemOperationContext> context, |
+ const FileSystemURL& url, |
+ const StatusCallback& callback) OVERRIDE; |
+ virtual void DeleteRecursively(scoped_ptr<FileSystemOperationContext> context, |
+ const FileSystemURL& url, |
+ const StatusCallback& callback) OVERRIDE; |
virtual void CreateSnapshotFile( |
scoped_ptr<FileSystemOperationContext> context, |
const FileSystemURL& url, |
@@ -113,6 +99,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AsyncFileUtilAdapter |
DISALLOW_COPY_AND_ASSIGN(AsyncFileUtilAdapter); |
}; |
-} // namespace fileapi |
+} // namespace storage |
#endif // WEBKIT_BROWSER_FILEAPI_ASYNC_FILE_UTIL_ADAPTER_H_ |