summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 21:44:35 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 21:44:35 +0000
commitc27a5ed3f25971f028dd1baedd73efb59497ceeb (patch)
tree178dbc2db3eec96e696277ffff66effe3281e502 /chrome/browser
parent5e0eb3c58f459bdf9b42d8666a7fef4f475224c5 (diff)
downloadchromium_src-c27a5ed3f25971f028dd1baedd73efb59497ceeb.zip
chromium_src-c27a5ed3f25971f028dd1baedd73efb59497ceeb.tar.gz
chromium_src-c27a5ed3f25971f028dd1baedd73efb59497ceeb.tar.bz2
Revert 61613 - possible culprit for valgrind error. (Support removeRecursively and new copy/move)
BUG=none TEST=none Review URL: http://codereview.chromium.org/3576017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-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 96571ce..6dd6072 100644
--- a/chrome/browser/file_system/file_system_dispatcher_host.cc
+++ b/chrome/browser/file_system/file_system_dispatcher_host.cc
@@ -161,11 +161,10 @@ void FileSystemDispatcherHost::OnCopy(
GetNewOperation(request_id)->Copy(src_path, dest_path);
}
-void FileSystemDispatcherHost::OnRemove(
- int request_id, const FilePath& path, bool recursive) {
+void FileSystemDispatcherHost::OnRemove(int request_id, const FilePath& path) {
if (!CheckValidFileSystemPath(path, request_id))
return;
- GetNewOperation(request_id)->Remove(path, recursive);
+ GetNewOperation(request_id)->Remove(path);
}
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 68110be..22a560a 100644
--- a/chrome/browser/file_system/file_system_dispatcher_host.h
+++ b/chrome/browser/file_system/file_system_dispatcher_host.h
@@ -21,6 +21,7 @@ namespace base {
class Time;
}
+class ChromeFileSystemOperation;
class FileSystemHostContext;
class GURL;
class HostContentSettingsMap;
@@ -49,7 +50,7 @@ class FileSystemDispatcherHost
void OnCopy(int request_id,
const FilePath& src_path,
const FilePath& dest_path);
- void OnRemove(int request_id, const FilePath& path, bool recursive);
+ void OnRemove(int request_id, const FilePath& path);
void OnReadMetadata(int request_id, const FilePath& path);
void OnCreate(int request_id,
const FilePath& path,