| Index: chrome/browser/local_discovery/storage/privet_filesystem_backend.h
|
| diff --git a/chrome/browser/local_discovery/storage/privet_filesystem_backend.h b/chrome/browser/local_discovery/storage/privet_filesystem_backend.h
|
| index e143d0e971306e78a9eb99d3b71f3c994fbfa565..80eee1f78dbb852cfd647f2f34e33e37356cfe66 100644
|
| --- a/chrome/browser/local_discovery/storage/privet_filesystem_backend.h
|
| +++ b/chrome/browser/local_discovery/storage/privet_filesystem_backend.h
|
| @@ -10,60 +10,59 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "content/public/browser/browser_context.h"
|
| -#include "webkit/browser/blob/file_stream_reader.h"
|
| -#include "webkit/browser/fileapi/external_mount_points.h"
|
| -#include "webkit/browser/fileapi/file_stream_writer.h"
|
| -#include "webkit/browser/fileapi/file_system_backend.h"
|
| +#include "storage/browser/blob/file_stream_reader.h"
|
| +#include "storage/browser/fileapi/external_mount_points.h"
|
| +#include "storage/browser/fileapi/file_stream_writer.h"
|
| +#include "storage/browser/fileapi/file_system_backend.h"
|
|
|
| namespace local_discovery {
|
|
|
| class PrivetFileSystemAsyncUtil;
|
|
|
| -class PrivetFileSystemBackend : public fileapi::FileSystemBackend {
|
| +class PrivetFileSystemBackend : public storage::FileSystemBackend {
|
| public:
|
| - PrivetFileSystemBackend(fileapi::ExternalMountPoints* mount_points,
|
| + PrivetFileSystemBackend(storage::ExternalMountPoints* mount_points,
|
| content::BrowserContext* browser_context);
|
| virtual ~PrivetFileSystemBackend();
|
|
|
| // FileSystemBackend implementation.
|
| - virtual bool CanHandleType(fileapi::FileSystemType type) const OVERRIDE;
|
| - virtual void Initialize(fileapi::FileSystemContext* context) OVERRIDE;
|
| + virtual bool CanHandleType(storage::FileSystemType type) const OVERRIDE;
|
| + virtual void Initialize(storage::FileSystemContext* context) OVERRIDE;
|
|
|
| - virtual void ResolveURL(const fileapi::FileSystemURL& url,
|
| - fileapi::OpenFileSystemMode mode,
|
| + virtual void ResolveURL(const storage::FileSystemURL& url,
|
| + storage::OpenFileSystemMode mode,
|
| const OpenFileSystemCallback& callback) OVERRIDE;
|
|
|
| - virtual fileapi::AsyncFileUtil* GetAsyncFileUtil(
|
| - fileapi::FileSystemType type) OVERRIDE;
|
| - virtual fileapi::CopyOrMoveFileValidatorFactory*
|
| - GetCopyOrMoveFileValidatorFactory(
|
| - fileapi::FileSystemType type,
|
| - base::File::Error* error_code) OVERRIDE;
|
| + virtual storage::AsyncFileUtil* GetAsyncFileUtil(
|
| + storage::FileSystemType type) OVERRIDE;
|
| + virtual storage::CopyOrMoveFileValidatorFactory*
|
| + GetCopyOrMoveFileValidatorFactory(storage::FileSystemType type,
|
| + base::File::Error* error_code) OVERRIDE;
|
|
|
| - virtual fileapi::FileSystemOperation* CreateFileSystemOperation(
|
| - const fileapi::FileSystemURL& url,
|
| - fileapi::FileSystemContext* context,
|
| + virtual storage::FileSystemOperation* CreateFileSystemOperation(
|
| + const storage::FileSystemURL& url,
|
| + storage::FileSystemContext* context,
|
| base::File::Error* error_code) const OVERRIDE;
|
|
|
| virtual bool SupportsStreaming(
|
| - const fileapi::FileSystemURL& url) const OVERRIDE;
|
| + const storage::FileSystemURL& url) const OVERRIDE;
|
|
|
| - virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
|
| - const fileapi::FileSystemURL& url,
|
| + virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader(
|
| + const storage::FileSystemURL& url,
|
| int64 offset,
|
| const base::Time& expected_modification_time,
|
| - fileapi::FileSystemContext* context) const OVERRIDE;
|
| + storage::FileSystemContext* context) const OVERRIDE;
|
|
|
| - virtual scoped_ptr<fileapi::FileStreamWriter> CreateFileStreamWriter(
|
| - const fileapi::FileSystemURL& url,
|
| + virtual scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter(
|
| + const storage::FileSystemURL& url,
|
| int64 offset,
|
| - fileapi::FileSystemContext* context) const OVERRIDE;
|
| + storage::FileSystemContext* context) const OVERRIDE;
|
|
|
| - virtual fileapi::FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
|
| + virtual storage::FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
|
|
|
| private:
|
| // User mount points.
|
| - scoped_refptr<fileapi::ExternalMountPoints> mount_points_;
|
| + scoped_refptr<storage::ExternalMountPoints> mount_points_;
|
| scoped_ptr<PrivetFileSystemAsyncUtil> async_util_;
|
| };
|
|
|
|
|