| Index: storage/browser/fileapi/sandbox_file_stream_writer.h
|
| diff --git a/webkit/browser/fileapi/sandbox_file_stream_writer.h b/storage/browser/fileapi/sandbox_file_stream_writer.h
|
| similarity index 73%
|
| rename from webkit/browser/fileapi/sandbox_file_stream_writer.h
|
| rename to storage/browser/fileapi/sandbox_file_stream_writer.h
|
| index 53cbb50366a602566e73e36ada45db2b090ef38c..53533d2206b8564538adbdd8b9c2a2b039664f7b 100644
|
| --- a/webkit/browser/fileapi/sandbox_file_stream_writer.h
|
| +++ b/storage/browser/fileapi/sandbox_file_stream_writer.h
|
| @@ -9,21 +9,21 @@
|
| #include "base/files/file_path.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "url/gurl.h"
|
| -#include "webkit/browser/fileapi/file_stream_writer.h"
|
| -#include "webkit/browser/fileapi/file_system_url.h"
|
| -#include "webkit/browser/fileapi/task_runner_bound_observer_list.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| -#include "webkit/common/blob/shareable_file_reference.h"
|
| -#include "webkit/common/fileapi/file_system_types.h"
|
| -#include "webkit/common/quota/quota_types.h"
|
| +#include "storage/browser/fileapi/file_stream_writer.h"
|
| +#include "storage/browser/fileapi/file_system_url.h"
|
| +#include "storage/browser/fileapi/task_runner_bound_observer_list.h"
|
| +#include "storage/common/storage_export.h"
|
| +#include "storage/common/blob/shareable_file_reference.h"
|
| +#include "storage/common/fileapi/file_system_types.h"
|
| +#include "storage/common/quota/quota_types.h"
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
|
|
| class FileSystemContext;
|
| class FileSystemQuotaUtil;
|
| class FileStreamWriter;
|
|
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE SandboxFileStreamWriter
|
| +class STORAGE_EXPORT_PRIVATE SandboxFileStreamWriter
|
| : public NON_EXPORTED_BASE(FileStreamWriter) {
|
| public:
|
| SandboxFileStreamWriter(FileSystemContext* file_system_context,
|
| @@ -33,19 +33,19 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE SandboxFileStreamWriter
|
| virtual ~SandboxFileStreamWriter();
|
|
|
| // FileStreamWriter overrides.
|
| - virtual int Write(net::IOBuffer* buf, int buf_len,
|
| + virtual int Write(net::IOBuffer* buf,
|
| + int buf_len,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| virtual int Cancel(const net::CompletionCallback& callback) OVERRIDE;
|
| virtual int Flush(const net::CompletionCallback& callback) OVERRIDE;
|
|
|
| // Used only by tests.
|
| - void set_default_quota(int64 quota) {
|
| - default_quota_ = quota;
|
| - }
|
| + void set_default_quota(int64 quota) { default_quota_ = quota; }
|
|
|
| private:
|
| // Performs quota calculation and calls local_file_writer_->Write().
|
| - int WriteInternal(net::IOBuffer* buf, int buf_len,
|
| + int WriteInternal(net::IOBuffer* buf,
|
| + int buf_len,
|
| const net::CompletionCallback& callback);
|
|
|
| // Callbacks that are chained for the first write. This eventually calls
|
| @@ -55,11 +55,13 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE SandboxFileStreamWriter
|
| base::File::Error file_error,
|
| const base::File::Info& file_info,
|
| const base::FilePath& platform_path,
|
| - const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref);
|
| + const scoped_refptr<storage::ShareableFileReference>& file_ref);
|
| void DidGetUsageAndQuota(const net::CompletionCallback& callback,
|
| quota::QuotaStatusCode status,
|
| - int64 usage, int64 quota);
|
| - void DidInitializeForWrite(net::IOBuffer* buf, int buf_len,
|
| + int64 usage,
|
| + int64 quota);
|
| + void DidInitializeForWrite(net::IOBuffer* buf,
|
| + int buf_len,
|
| const net::CompletionCallback& callback,
|
| int init_status);
|
|
|
| @@ -90,6 +92,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE SandboxFileStreamWriter
|
| DISALLOW_COPY_AND_ASSIGN(SandboxFileStreamWriter);
|
| };
|
|
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_BROWSER_FILEAPI_SANDBOX_FILE_STREAM_WRITER_H_
|
|
|