| Index: storage/browser/fileapi/file_system_operation_impl.cc
|
| diff --git a/storage/browser/fileapi/file_system_operation_impl.cc b/storage/browser/fileapi/file_system_operation_impl.cc
|
| index bf259672068ccf63d561f49054b69d746aaf71a7..60e39ab97013283bb5dbf653a16862c6ff2bb15d 100644
|
| --- a/storage/browser/fileapi/file_system_operation_impl.cc
|
| +++ b/storage/browser/fileapi/file_system_operation_impl.cc
|
| @@ -88,21 +88,19 @@ void FileSystemOperationImpl::Copy(
|
| const FileSystemURL& src_url,
|
| const FileSystemURL& dest_url,
|
| CopyOrMoveOption option,
|
| + const bool continue_with_error,
|
| + const CopyOrMoveErrorCallback& error_callback,
|
| const CopyProgressCallback& progress_callback,
|
| const StatusCallback& callback) {
|
| DCHECK(SetPendingOperationType(kOperationCopy));
|
| DCHECK(!recursive_operation_delegate_);
|
|
|
| - // TODO(hidehiko): Support |progress_callback|. (crbug.com/278038).
|
| - recursive_operation_delegate_.reset(
|
| - new CopyOrMoveOperationDelegate(
|
| - file_system_context(),
|
| - src_url, dest_url,
|
| - CopyOrMoveOperationDelegate::OPERATION_COPY,
|
| - option,
|
| - progress_callback,
|
| - base::Bind(&FileSystemOperationImpl::DidFinishOperation,
|
| - weak_factory_.GetWeakPtr(), callback)));
|
| + recursive_operation_delegate_.reset(new CopyOrMoveOperationDelegate(
|
| + file_system_context(), src_url, dest_url,
|
| + CopyOrMoveOperationDelegate::OPERATION_COPY, option, continue_with_error,
|
| + error_callback, progress_callback,
|
| + base::Bind(&FileSystemOperationImpl::DidFinishOperation,
|
| + weak_factory_.GetWeakPtr(), callback)));
|
| recursive_operation_delegate_->RunRecursively();
|
| }
|
|
|
| @@ -112,15 +110,12 @@ void FileSystemOperationImpl::Move(const FileSystemURL& src_url,
|
| const StatusCallback& callback) {
|
| DCHECK(SetPendingOperationType(kOperationMove));
|
| DCHECK(!recursive_operation_delegate_);
|
| - recursive_operation_delegate_.reset(
|
| - new CopyOrMoveOperationDelegate(
|
| - file_system_context(),
|
| - src_url, dest_url,
|
| - CopyOrMoveOperationDelegate::OPERATION_MOVE,
|
| - option,
|
| - FileSystemOperation::CopyProgressCallback(),
|
| - base::Bind(&FileSystemOperationImpl::DidFinishOperation,
|
| - weak_factory_.GetWeakPtr(), callback)));
|
| + recursive_operation_delegate_.reset(new CopyOrMoveOperationDelegate(
|
| + file_system_context(), src_url, dest_url,
|
| + CopyOrMoveOperationDelegate::OPERATION_MOVE, option, false,
|
| + CopyOrMoveErrorCallback(), FileSystemOperation::CopyProgressCallback(),
|
| + base::Bind(&FileSystemOperationImpl::DidFinishOperation,
|
| + weak_factory_.GetWeakPtr(), callback)));
|
| recursive_operation_delegate_->RunRecursively();
|
| }
|
|
|
|
|