| Index: storage/browser/fileapi/file_system_backend.h
|
| diff --git a/webkit/browser/fileapi/file_system_backend.h b/storage/browser/fileapi/file_system_backend.h
|
| similarity index 87%
|
| rename from webkit/browser/fileapi/file_system_backend.h
|
| rename to storage/browser/fileapi/file_system_backend.h
|
| index f6cca94b7037aef65f33f2178226645cfa336b7c..ee0ea365a610efcc3f3e8a01c3ef749d39102f4d 100644
|
| --- a/webkit/browser/fileapi/file_system_backend.h
|
| +++ b/storage/browser/fileapi/file_system_backend.h
|
| @@ -12,18 +12,18 @@
|
| #include "base/files/file.h"
|
| #include "base/files/file_path.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "webkit/browser/fileapi/file_permission_policy.h"
|
| -#include "webkit/browser/fileapi/open_file_system_mode.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| -#include "webkit/common/fileapi/file_system_types.h"
|
| +#include "storage/browser/fileapi/file_permission_policy.h"
|
| +#include "storage/browser/fileapi/open_file_system_mode.h"
|
| +#include "storage/common/storage_export.h"
|
| +#include "storage/common/fileapi/file_system_types.h"
|
|
|
| class GURL;
|
|
|
| -namespace webkit_blob {
|
| +namespace storage {
|
| class FileStreamReader;
|
| }
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
|
|
| class AsyncFileUtil;
|
| class CopyOrMoveFileValidatorFactory;
|
| @@ -39,13 +39,12 @@ class FileSystemQuotaUtil;
|
| // NOTE: when you implement a new FileSystemBackend for your own
|
| // FileSystem module, please contact to kinuko@chromium.org.
|
| //
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemBackend {
|
| +class STORAGE_EXPORT FileSystemBackend {
|
| public:
|
| // Callback for InitializeFileSystem.
|
| typedef base::Callback<void(const GURL& root_url,
|
| const std::string& name,
|
| - base::File::Error error)>
|
| - OpenFileSystemCallback;
|
| + base::File::Error error)> OpenFileSystemCallback;
|
| virtual ~FileSystemBackend() {}
|
|
|
| // Returns true if this filesystem backend can handle |type|.
|
| @@ -74,7 +73,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemBackend {
|
| // and |type|. If |error_code| is File::FILE_OK and the result is NULL,
|
| // then no validator is required.
|
| virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
|
| - FileSystemType type, base::File::Error* error_code) = 0;
|
| + FileSystemType type,
|
| + base::File::Error* error_code) = 0;
|
|
|
| // Returns a new instance of the specialized FileSystemOperation for this
|
| // backend based on the given triplet of |origin_url|, |file_system_type|
|
| @@ -100,7 +100,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemBackend {
|
| // ERR_UPLOAD_FILE_CHANGED error.
|
| // This method itself does *not* check if the given path exists and is a
|
| // regular file.
|
| - virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
|
| + virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader(
|
| const FileSystemURL& url,
|
| int64 offset,
|
| const base::Time& expected_modification_time,
|
| @@ -121,13 +121,13 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemBackend {
|
| };
|
|
|
| // An interface to control external file system access permissions.
|
| -// TODO(satorux): Move this out of 'webkit/browser/fileapi'. crbug.com/257279
|
| +// TODO(satorux): Move this out of 'storage/browser/fileapi'. crbug.com/257279
|
| class ExternalFileSystemBackend : public FileSystemBackend {
|
| public:
|
| // Returns true if |url| is allowed to be accessed.
|
| // This is supposed to perform ExternalFileSystem-specific security
|
| // checks.
|
| - virtual bool IsAccessAllowed(const fileapi::FileSystemURL& url) const = 0;
|
| + virtual bool IsAccessAllowed(const storage::FileSystemURL& url) const = 0;
|
| // Returns the list of top level directories that are exposed by this
|
| // provider. This list is used to set appropriate child process file access
|
| // permissions.
|
| @@ -140,14 +140,13 @@ class ExternalFileSystemBackend : public FileSystemBackend {
|
| const std::string& extension_id,
|
| const base::FilePath& virtual_path) = 0;
|
| // Revokes file access from extension identified with |extension_id|.
|
| - virtual void RevokeAccessForExtension(
|
| - const std::string& extension_id) = 0;
|
| + virtual void RevokeAccessForExtension(const std::string& extension_id) = 0;
|
| // Gets virtual path by known filesystem path. Returns false when filesystem
|
| // path is not exposed by this provider.
|
| virtual bool GetVirtualPath(const base::FilePath& file_system_path,
|
| base::FilePath* virtual_path) = 0;
|
| };
|
|
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_BACKEND_H_
|
|
|