| Index: storage/browser/fileapi/file_system_operation_runner.cc
|
| diff --git a/storage/browser/fileapi/file_system_operation_runner.cc b/storage/browser/fileapi/file_system_operation_runner.cc
|
| index 8dc39e6c747c33452a8888b128f5823ac7eed208..458275592f40c3fd52e75ae12aa74ff9a9e2bab5 100644
|
| --- a/storage/browser/fileapi/file_system_operation_runner.cc
|
| +++ b/storage/browser/fileapi/file_system_operation_runner.cc
|
| @@ -86,6 +86,7 @@ OperationID FileSystemOperationRunner::Copy(
|
| const FileSystemURL& src_url,
|
| const FileSystemURL& dest_url,
|
| CopyOrMoveOption option,
|
| + const ErrorBehavior error_behavior,
|
| const CopyProgressCallback& progress_callback,
|
| const StatusCallback& callback) {
|
| base::File::Error error = base::File::FILE_OK;
|
| @@ -99,14 +100,13 @@ OperationID FileSystemOperationRunner::Copy(
|
| }
|
| PrepareForWrite(handle.id, dest_url);
|
| PrepareForRead(handle.id, src_url);
|
| - operation->Copy(
|
| - src_url, dest_url, option,
|
| - progress_callback.is_null() ?
|
| - CopyProgressCallback() :
|
| - base::Bind(&FileSystemOperationRunner::OnCopyProgress, AsWeakPtr(),
|
| - handle, progress_callback),
|
| - base::Bind(&FileSystemOperationRunner::DidFinish, AsWeakPtr(),
|
| - handle, callback));
|
| + operation->Copy(src_url, dest_url, option, error_behavior,
|
| + progress_callback.is_null()
|
| + ? CopyProgressCallback()
|
| + : base::Bind(&FileSystemOperationRunner::OnCopyProgress,
|
| + AsWeakPtr(), handle, progress_callback),
|
| + base::Bind(&FileSystemOperationRunner::DidFinish, AsWeakPtr(),
|
| + handle, callback));
|
| return handle.id;
|
| }
|
|
|
|
|