summaryrefslogtreecommitdiffstats
path: root/webkit/chromeos
diff options
context:
space:
mode:
authorkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-11 02:44:53 +0000
committerkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-11 02:44:53 +0000
commitda36b9cb2d717020b2544d4c9179d75685a4092c (patch)
tree4822dbe599b806284c560ad66a17434f8e4badd9 /webkit/chromeos
parent46d5304577719a2cd312b28db6410abd23fd2f45 (diff)
downloadchromium_src-da36b9cb2d717020b2544d4c9179d75685a4092c.zip
chromium_src-da36b9cb2d717020b2544d4c9179d75685a4092c.tar.gz
chromium_src-da36b9cb2d717020b2544d4c9179d75685a4092c.tar.bz2
Revert 121620 - Refactor FileSystemOperation to take callback for each method.
This patch is the first step for supporting cross-filesystem copy/move on the Filesystem API implementation. To accomplish it, I'm planning to crack FileSystemOperation::{Move,Copy} to a series of other FSO operations. For it, per-method callback is more handy. BUG=110121 TEST=*File* Review URL: http://codereview.chromium.org/9372044 TBR=kinaba@chromium.org Review URL: https://chromiumcodereview.appspot.com/9380040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121623 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/chromeos')
-rw-r--r--webkit/chromeos/fileapi/cros_mount_point_provider.cc5
-rw-r--r--webkit/chromeos/fileapi/cros_mount_point_provider.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
index 07ab125..011ed76 100644
--- a/webkit/chromeos/fileapi/cros_mount_point_provider.cc
+++ b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
@@ -16,6 +16,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "webkit/chromeos/fileapi/file_access_permissions.h"
+#include "webkit/fileapi/file_system_callback_dispatcher.h"
#include "webkit/fileapi/file_system_operation.h"
#include "webkit/fileapi/file_system_util.h"
#include "webkit/fileapi/native_file_util.h"
@@ -184,11 +185,13 @@ CrosMountPointProvider::CreateFileSystemOperation(
const GURL& origin_url,
fileapi::FileSystemType file_system_type,
const FilePath& virtual_path,
+ scoped_ptr<fileapi::FileSystemCallbackDispatcher> dispatcher,
base::MessageLoopProxy* file_proxy,
fileapi::FileSystemContext* context) const {
// TODO(satorux,zel): instantiate appropriate FileSystemOperation that
// implements async/remote operations.
- return new fileapi::FileSystemOperation(file_proxy, context);
+ return new fileapi::FileSystemOperation(
+ dispatcher.Pass(), file_proxy, context);
}
bool CrosMountPointProvider::GetVirtualPath(const FilePath& filesystem_path,
diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.h b/webkit/chromeos/fileapi/cros_mount_point_provider.h
index 1ebdab8..a509c11 100644
--- a/webkit/chromeos/fileapi/cros_mount_point_provider.h
+++ b/webkit/chromeos/fileapi/cros_mount_point_provider.h
@@ -57,6 +57,7 @@ class CrosMountPointProvider
const GURL& origin_url,
fileapi::FileSystemType file_system_type,
const FilePath& virtual_path,
+ scoped_ptr<fileapi::FileSystemCallbackDispatcher> dispatcher,
base::MessageLoopProxy* file_proxy,
fileapi::FileSystemContext* context) const OVERRIDE;