Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/fileapi/file_system_file_util_proxy.cc

Issue 8424007: Bind: Merge FileUtilProxy and FileSystemFileUtilProxy: Delete/Touch/Truncate/Copy/Move (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased2 Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/fileapi/file_system_file_util_proxy.h ('k') | webkit/fileapi/file_system_operation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/file_system_file_util_proxy.cc
diff --git a/webkit/fileapi/file_system_file_util_proxy.cc b/webkit/fileapi/file_system_file_util_proxy.cc
index 01af4b9af52c1863ea50a7c1e82868ced88f4861..9569d414be73559d3a60426ce4a5513dc34caf79 100644
--- a/webkit/fileapi/file_system_file_util_proxy.cc
+++ b/webkit/fileapi/file_system_file_util_proxy.cc
@@ -71,90 +71,6 @@ class MessageLoopRelay
fileapi::FileSystemFileUtil* file_util_;
};
-class RelayCreateOrOpen : public MessageLoopRelay {
- public:
- RelayCreateOrOpen(
- const fileapi::FileSystemOperationContext& context,
- scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
- const FilePath& file_path,
- int file_flags,
- const fileapi::FileSystemFileUtilProxy::CreateOrOpenCallback& callback)
- : MessageLoopRelay(context),
- message_loop_proxy_(message_loop_proxy),
- file_path_(file_path),
- file_flags_(file_flags),
- callback_(callback),
- file_handle_(base::kInvalidPlatformFileValue),
- created_(false) {
- DCHECK_EQ(false, callback.is_null());
- }
-
- protected:
- virtual ~RelayCreateOrOpen() {
- if (file_handle_ != base::kInvalidPlatformFileValue)
- fileapi::FileSystemFileUtilProxy::Close(
- *context(), message_loop_proxy_, file_handle_,
- fileapi::FileSystemFileUtilProxy::StatusCallback());
- }
-
- virtual void RunWork() {
- set_error_code(file_util()->CreateOrOpen(
- context(), file_path_, file_flags_, &file_handle_, &created_));
- }
-
- virtual void RunCallback() {
- callback_.Run(error_code(), base::PassPlatformFile(&file_handle_),
- created_);
- }
-
- private:
- scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
- FilePath file_path_;
- int file_flags_;
- fileapi::FileSystemFileUtilProxy::CreateOrOpenCallback callback_;
- base::PlatformFile file_handle_;
- bool created_;
-};
-
-class RelayWithStatusCallback : public MessageLoopRelay {
- public:
- RelayWithStatusCallback(
- const fileapi::FileSystemOperationContext& context,
- const fileapi::FileSystemFileUtilProxy::StatusCallback& callback)
- : MessageLoopRelay(context),
- callback_(callback) {
- // It is OK for callback to be NULL.
- }
-
- protected:
- virtual void RunCallback() {
- // The caller may not have been interested in the result.
- if (!callback_.is_null())
- callback_.Run(error_code());
- }
-
- private:
- fileapi::FileSystemFileUtilProxy::StatusCallback callback_;
-};
-
-class RelayClose : public RelayWithStatusCallback {
- public:
- RelayClose(const fileapi::FileSystemOperationContext& context,
- base::PlatformFile file_handle,
- const fileapi::FileSystemFileUtilProxy::StatusCallback& callback)
- : RelayWithStatusCallback(context, callback),
- file_handle_(file_handle) {
- }
-
- protected:
- virtual void RunWork() {
- set_error_code(file_util()->Close(context(), file_handle_));
- }
-
- private:
- base::PlatformFile file_handle_;
-};
-
class RelayEnsureFileExists : public MessageLoopRelay {
public:
RelayEnsureFileExists(
@@ -189,35 +105,6 @@ class RelayEnsureFileExists : public MessageLoopRelay {
};
-class RelayGetLocalPath : public MessageLoopRelay {
- public:
- RelayGetLocalPath(
- const fileapi::FileSystemOperationContext& context,
- const FilePath& virtual_path,
- fileapi::FileSystemFileUtilProxy::GetLocalPathCallback* callback)
- : MessageLoopRelay(context),
- callback_(callback),
- virtual_path_(virtual_path) {
- DCHECK(callback);
- }
-
- protected:
- virtual void RunWork() {
- set_error_code(file_util()->GetLocalFilePath(
- context(), virtual_path_, &local_path_));
- }
-
- virtual void RunCallback() {
- callback_->Run(error_code(), local_path_);
- delete callback_;
- }
-
- private:
- fileapi::FileSystemFileUtilProxy::GetLocalPathCallback* callback_;
- FilePath virtual_path_;
- FilePath local_path_;
-};
-
class RelayGetFileInfo : public MessageLoopRelay {
public:
RelayGetFileInfo(
@@ -275,145 +162,6 @@ class RelayReadDirectory : public MessageLoopRelay {
std::vector<base::FileUtilProxy::Entry> entries_;
};
-class RelayCreateDirectory : public RelayWithStatusCallback {
- public:
- RelayCreateDirectory(
- const fileapi::FileSystemOperationContext& context,
- const FilePath& file_path,
- bool exclusive,
- bool recursive,
- const fileapi::FileSystemFileUtilProxy::StatusCallback& callback)
- : RelayWithStatusCallback(context, callback),
- file_path_(file_path),
- exclusive_(exclusive),
- recursive_(recursive) {
- }
-
- protected:
- virtual void RunWork() {
- set_error_code(file_util()->CreateDirectory(
- context(), file_path_, exclusive_, recursive_));
- }
-
- private:
- FilePath file_path_;
- bool exclusive_;
- bool recursive_;
-};
-
-class RelayCopy : public RelayWithStatusCallback {
- public:
- RelayCopy(const fileapi::FileSystemOperationContext& context,
- const FilePath& src_file_path,
- const FilePath& dest_file_path,
- const fileapi::FileSystemFileUtilProxy::StatusCallback& callback)
- : RelayWithStatusCallback(context, callback),
- src_file_path_(src_file_path),
- dest_file_path_(dest_file_path) {
- }
-
- protected:
- virtual void RunWork() {
- set_error_code(file_util()->Copy(
- context(), src_file_path_, dest_file_path_));
- }
-
- private:
- FilePath src_file_path_;
- FilePath dest_file_path_;
-};
-
-class RelayMove : public RelayWithStatusCallback {
- public:
- RelayMove(const fileapi::FileSystemOperationContext& context,
- const FilePath& src_file_path,
- const FilePath& dest_file_path,
- const fileapi::FileSystemFileUtilProxy::StatusCallback& callback)
- : RelayWithStatusCallback(context, callback),
- src_file_path_(src_file_path),
- dest_file_path_(dest_file_path) {
- }
-
- protected:
- virtual void RunWork() {
- set_error_code(file_util()->Move(
- context(), src_file_path_, dest_file_path_));
- }
-
- private:
- FilePath src_file_path_;
- FilePath dest_file_path_;
-};
-
-class RelayDelete : public RelayWithStatusCallback {
- public:
- RelayDelete(const fileapi::FileSystemOperationContext& context,
- const FilePath& file_path,
- bool recursive,
- const fileapi::FileSystemFileUtilProxy::StatusCallback& callback)
- : RelayWithStatusCallback(context, callback),
- file_path_(file_path),
- recursive_(recursive) {
- }
-
- protected:
- virtual void RunWork() {
- set_error_code(file_util()->Delete(context(), file_path_, recursive_));
- }
-
- private:
- FilePath file_path_;
- bool recursive_;
-};
-
-class RelayTouchFilePath : public RelayWithStatusCallback {
- public:
- RelayTouchFilePath(
- const fileapi::FileSystemOperationContext& context,
- const FilePath& file_path,
- const base::Time& last_access_time,
- const base::Time& last_modified_time,
- const fileapi::FileSystemFileUtilProxy::StatusCallback& callback)
- : RelayWithStatusCallback(context, callback),
- file_path_(file_path),
- last_access_time_(last_access_time),
- last_modified_time_(last_modified_time) {
- }
-
- protected:
- virtual void RunWork() {
- set_error_code(file_util()->Touch(
- context(), file_path_, last_access_time_, last_modified_time_));
- }
-
- private:
- FilePath file_path_;
- base::Time last_access_time_;
- base::Time last_modified_time_;
-};
-
-class RelayTruncate : public RelayWithStatusCallback {
- public:
- RelayTruncate(
- const fileapi::FileSystemOperationContext& context,
- const FilePath& file_path,
- int64 length,
- const fileapi::FileSystemFileUtilProxy::StatusCallback& callback)
- : RelayWithStatusCallback(context, callback),
- file_path_(file_path),
- length_(length) {
- }
-
- protected:
- virtual void RunWork() {
- set_error_code(file_util()->Truncate(context(), file_path_, length_));
- }
-
- private:
- FilePath file_path_;
- int64 length_;
-};
-
bool Start(const tracked_objects::Location& from_here,
scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
scoped_refptr<MessageLoopRelay> relay) {
@@ -425,26 +173,6 @@ bool Start(const tracked_objects::Location& from_here,
namespace fileapi {
// static
-bool FileSystemFileUtilProxy::CreateOrOpen(
- const FileSystemOperationContext& context,
- scoped_refptr<MessageLoopProxy> message_loop_proxy,
- const FilePath& file_path, int file_flags,
- const CreateOrOpenCallback& callback) {
- return Start(FROM_HERE, message_loop_proxy, new RelayCreateOrOpen(context,
- message_loop_proxy, file_path, file_flags, callback));
-}
-
-// static
-bool FileSystemFileUtilProxy::Close(
- const FileSystemOperationContext& context,
- scoped_refptr<MessageLoopProxy> message_loop_proxy,
- base::PlatformFile file_handle,
- const StatusCallback& callback) {
- return Start(FROM_HERE, message_loop_proxy,
- new RelayClose(context, file_handle, callback));
-}
-
-// static
bool FileSystemFileUtilProxy::EnsureFileExists(
const FileSystemOperationContext& context,
scoped_refptr<MessageLoopProxy> message_loop_proxy,
@@ -455,16 +183,6 @@ bool FileSystemFileUtilProxy::EnsureFileExists(
}
// static
-bool FileSystemFileUtilProxy::GetLocalPath(
- const FileSystemOperationContext& context,
- scoped_refptr<MessageLoopProxy> message_loop_proxy,
- const FilePath& virtual_path,
- GetLocalPathCallback* callback) {
- return Start(FROM_HERE, message_loop_proxy,
- new RelayGetLocalPath(context, virtual_path, callback));
-}
-
-// static
bool FileSystemFileUtilProxy::GetFileInfo(
const FileSystemOperationContext& context,
scoped_refptr<MessageLoopProxy> message_loop_proxy,
@@ -484,75 +202,4 @@ bool FileSystemFileUtilProxy::ReadDirectory(
file_path, callback));
}
-// static
-bool FileSystemFileUtilProxy::CreateDirectory(
- const FileSystemOperationContext& context,
- scoped_refptr<MessageLoopProxy> message_loop_proxy,
- const FilePath& file_path,
- bool exclusive,
- bool recursive,
- const StatusCallback& callback) {
- return Start(FROM_HERE, message_loop_proxy, new RelayCreateDirectory(
- context, file_path, exclusive, recursive, callback));
-}
-
-// static
-bool FileSystemFileUtilProxy::Copy(
- const FileSystemOperationContext& context,
- scoped_refptr<MessageLoopProxy> message_loop_proxy,
- const FilePath& src_file_path,
- const FilePath& dest_file_path,
- const StatusCallback& callback) {
- return Start(FROM_HERE, message_loop_proxy,
- new RelayCopy(context, src_file_path, dest_file_path,
- callback));
-}
-
-// static
-bool FileSystemFileUtilProxy::Move(
- const FileSystemOperationContext& context,
- scoped_refptr<MessageLoopProxy> message_loop_proxy,
- const FilePath& src_file_path,
- const FilePath& dest_file_path,
- const StatusCallback& callback) {
- return Start(FROM_HERE, message_loop_proxy,
- new RelayMove(context, src_file_path, dest_file_path,
- callback));
-}
-
-// static
-bool FileSystemFileUtilProxy::Delete(
- const FileSystemOperationContext& context,
- scoped_refptr<MessageLoopProxy> message_loop_proxy,
- const FilePath& file_path,
- bool recursive,
- const StatusCallback& callback) {
- return Start(FROM_HERE, message_loop_proxy,
- new RelayDelete(context, file_path, recursive, callback));
-}
-
-// static
-bool FileSystemFileUtilProxy::Touch(
- const FileSystemOperationContext& context,
- scoped_refptr<MessageLoopProxy> message_loop_proxy,
- const FilePath& file_path,
- const base::Time& last_access_time,
- const base::Time& last_modified_time,
- const StatusCallback& callback) {
- return Start(FROM_HERE, message_loop_proxy,
- new RelayTouchFilePath(context, file_path, last_access_time,
- last_modified_time, callback));
-}
-
-// static
-bool FileSystemFileUtilProxy::Truncate(
- const FileSystemOperationContext& context,
- scoped_refptr<MessageLoopProxy> message_loop_proxy,
- const FilePath& path,
- int64 length,
- const StatusCallback& callback) {
- return Start(FROM_HERE, message_loop_proxy,
- new RelayTruncate(context, path, length, callback));
-}
-
} // namespace fileapi
« no previous file with comments | « webkit/fileapi/file_system_file_util_proxy.h ('k') | webkit/fileapi/file_system_operation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698