Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1225)

Unified Diff: storage/browser/fileapi/file_system_operation_runner.cc

Issue 1194783002: Add fileManagerPrivate.onCopyError event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove const and rename enum. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..16480557078ce8437d4827b6124488ebc97782cb 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,
+ 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;
}
« no previous file with comments | « storage/browser/fileapi/file_system_operation_runner.h ('k') | storage/browser/fileapi/recursive_operation_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698