diff options
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/file_system/file_system_dispatcher.cc | 4 | ||||
-rw-r--r-- | chrome/common/file_system/file_system_dispatcher.h | 1 | ||||
-rw-r--r-- | chrome/common/file_system/webfilesystem_impl.cc | 11 | ||||
-rw-r--r-- | chrome/common/file_system/webfilesystem_impl.h | 4 | ||||
-rw-r--r-- | chrome/common/render_messages_internal.h | 5 |
5 files changed, 5 insertions, 20 deletions
diff --git a/chrome/common/file_system/file_system_dispatcher.cc b/chrome/common/file_system/file_system_dispatcher.cc index bc52f3a..a8761a2 100644 --- a/chrome/common/file_system/file_system_dispatcher.cc +++ b/chrome/common/file_system/file_system_dispatcher.cc @@ -67,11 +67,10 @@ bool FileSystemDispatcher::Copy( bool FileSystemDispatcher::Remove( const FilePath& path, - bool recursive, fileapi::FileSystemCallbackDispatcher* dispatcher) { int request_id = dispatchers_.Add(dispatcher); return ChildThread::current()->Send( - new ViewHostMsg_FileSystem_Remove(request_id, path, recursive)); + new ViewHostMsg_FileSystem_Remove(request_id, path)); } bool FileSystemDispatcher::ReadMetadata( @@ -220,3 +219,4 @@ void FileSystemDispatcher::DidWrite( if (complete) dispatchers_.Remove(request_id); } + diff --git a/chrome/common/file_system/file_system_dispatcher.h b/chrome/common/file_system/file_system_dispatcher.h index 8802c1e..80443c4 100644 --- a/chrome/common/file_system/file_system_dispatcher.h +++ b/chrome/common/file_system/file_system_dispatcher.h @@ -43,7 +43,6 @@ class FileSystemDispatcher { const FilePath& dest_path, fileapi::FileSystemCallbackDispatcher* dispatcher); bool Remove(const FilePath& path, - bool recursive, fileapi::FileSystemCallbackDispatcher* dispatcher); bool ReadMetadata(const FilePath& path, fileapi::FileSystemCallbackDispatcher* dispatcher); diff --git a/chrome/common/file_system/webfilesystem_impl.cc b/chrome/common/file_system/webfilesystem_impl.cc index 5b180f6..9128cf1 100644 --- a/chrome/common/file_system/webfilesystem_impl.cc +++ b/chrome/common/file_system/webfilesystem_impl.cc @@ -47,16 +47,6 @@ void WebFileSystemImpl::remove(const WebString& path, FileSystemDispatcher* dispatcher = ChildThread::current()->file_system_dispatcher(); dispatcher->Remove(webkit_glue::WebStringToFilePath(path), - false /* recursive */, - new WebFileSystemCallbackDispatcher(callbacks)); -} - -void WebFileSystemImpl::removeRecursively(const WebString& path, - WebFileSystemCallbacks* callbacks) { - FileSystemDispatcher* dispatcher = - ChildThread::current()->file_system_dispatcher(); - dispatcher->Remove(webkit_glue::WebStringToFilePath(path), - true /* recursive */, new WebFileSystemCallbackDispatcher(callbacks)); } @@ -114,3 +104,4 @@ WebKit::WebFileWriter* WebFileSystemImpl::createFileWriter( const WebString& path, WebKit::WebFileWriterClient* client) { return new WebFileWriterImpl(path, client); } + diff --git a/chrome/common/file_system/webfilesystem_impl.h b/chrome/common/file_system/webfilesystem_impl.h index fc051e0..6892eac 100644 --- a/chrome/common/file_system/webfilesystem_impl.h +++ b/chrome/common/file_system/webfilesystem_impl.h @@ -32,10 +32,6 @@ class WebFileSystemImpl : public WebKit::WebFileSystem { const WebKit::WebString& path, WebKit::WebFileSystemCallbacks*); - virtual void removeRecursively( - const WebKit::WebString& path, - WebKit::WebFileSystemCallbacks*); - virtual void readMetadata( const WebKit::WebString& path, WebKit::WebFileSystemCallbacks*); diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 1008de2..c507af6 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -2858,10 +2858,9 @@ IPC_BEGIN_MESSAGES(ViewHost) FilePath /* dest path */) // WebFileSystem::remove() message. - IPC_MESSAGE_CONTROL3(ViewHostMsg_FileSystem_Remove, + IPC_MESSAGE_CONTROL2(ViewHostMsg_FileSystem_Remove, int /* request_id */, - FilePath /* path */, - bool /* recursive */) + FilePath /* path */) // WebFileSystem::readMetadata() message. IPC_MESSAGE_CONTROL2(ViewHostMsg_FileSystem_ReadMetadata, |