summaryrefslogtreecommitdiffstats
path: root/chrome/browser/file_system
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 05:33:39 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 05:33:39 +0000
commitd292409206bdfee695b72eae60279a15acb0acd8 (patch)
tree1991c7c6a67eb83973d8ae5cc1ec4c40ba025271 /chrome/browser/file_system
parentfaec631688b3e0c87032d95a47cc945613431f45 (diff)
downloadchromium_src-d292409206bdfee695b72eae60279a15acb0acd8.zip
chromium_src-d292409206bdfee695b72eae60279a15acb0acd8.tar.gz
chromium_src-d292409206bdfee695b72eae60279a15acb0acd8.tar.bz2
Support removeRecursively and new copy/move behaviors added to the spec recently.
http://lists.w3.org/Archives/Public/public-webapps/2010JulSep/1101.html > For a move/copy of a file on top of existing file, or a directory on > top of an existing empty directory, you get an automatic overwrite. > A move/copy of a file on top of an existing directory, or of a > directory on top of an existing file, will always fail. > A move/copy of a file or directory on top of an existing non-empty > directory will always fail. BUG=32277 TEST=FileSystemOperationTest.* Review URL: http://codereview.chromium.org/3567012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/file_system')
-rw-r--r--chrome/browser/file_system/file_system_dispatcher_host.cc5
-rw-r--r--chrome/browser/file_system/file_system_dispatcher_host.h3
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/file_system/file_system_dispatcher_host.cc b/chrome/browser/file_system/file_system_dispatcher_host.cc
index 6dd6072..96571ce 100644
--- a/chrome/browser/file_system/file_system_dispatcher_host.cc
+++ b/chrome/browser/file_system/file_system_dispatcher_host.cc
@@ -161,10 +161,11 @@ void FileSystemDispatcherHost::OnCopy(
GetNewOperation(request_id)->Copy(src_path, dest_path);
}
-void FileSystemDispatcherHost::OnRemove(int request_id, const FilePath& path) {
+void FileSystemDispatcherHost::OnRemove(
+ int request_id, const FilePath& path, bool recursive) {
if (!CheckValidFileSystemPath(path, request_id))
return;
- GetNewOperation(request_id)->Remove(path);
+ GetNewOperation(request_id)->Remove(path, recursive);
}
void FileSystemDispatcherHost::OnReadMetadata(
diff --git a/chrome/browser/file_system/file_system_dispatcher_host.h b/chrome/browser/file_system/file_system_dispatcher_host.h
index 22a560a..68110be 100644
--- a/chrome/browser/file_system/file_system_dispatcher_host.h
+++ b/chrome/browser/file_system/file_system_dispatcher_host.h
@@ -21,7 +21,6 @@ namespace base {
class Time;
}
-class ChromeFileSystemOperation;
class FileSystemHostContext;
class GURL;
class HostContentSettingsMap;
@@ -50,7 +49,7 @@ class FileSystemDispatcherHost
void OnCopy(int request_id,
const FilePath& src_path,
const FilePath& dest_path);
- void OnRemove(int request_id, const FilePath& path);
+ void OnRemove(int request_id, const FilePath& path, bool recursive);
void OnReadMetadata(int request_id, const FilePath& path);
void OnCreate(int request_id,
const FilePath& path,