| Index: storage/browser/fileapi/copy_or_move_operation_delegate.h
|
| diff --git a/storage/browser/fileapi/copy_or_move_operation_delegate.h b/storage/browser/fileapi/copy_or_move_operation_delegate.h
|
| index e6785e91bcccc156a6902fd6d2d7015d221ba2db..546fb626fa08339272f8a0ba7b919e7ff72c9522 100644
|
| --- a/storage/browser/fileapi/copy_or_move_operation_delegate.h
|
| +++ b/storage/browser/fileapi/copy_or_move_operation_delegate.h
|
| @@ -35,6 +35,7 @@ class CopyOrMoveOperationDelegate
|
| public:
|
| class CopyOrMoveImpl;
|
| typedef FileSystemOperation::CopyProgressCallback CopyProgressCallback;
|
| + typedef FileSystemOperation::CopyOrMoveErrorCallback CopyOrMoveErrorCallback;
|
| typedef FileSystemOperation::CopyOrMoveOption CopyOrMoveOption;
|
|
|
| enum OperationType {
|
| @@ -91,14 +92,15 @@ class CopyOrMoveOperationDelegate
|
| DISALLOW_COPY_AND_ASSIGN(StreamCopyHelper);
|
| };
|
|
|
| - CopyOrMoveOperationDelegate(
|
| - FileSystemContext* file_system_context,
|
| - const FileSystemURL& src_root,
|
| - const FileSystemURL& dest_root,
|
| - OperationType operation_type,
|
| - CopyOrMoveOption option,
|
| - const CopyProgressCallback& progress_callback,
|
| - const StatusCallback& callback);
|
| + CopyOrMoveOperationDelegate(FileSystemContext* file_system_context,
|
| + const FileSystemURL& src_root,
|
| + const FileSystemURL& dest_root,
|
| + OperationType operation_type,
|
| + CopyOrMoveOption option,
|
| + const bool continue_with_error,
|
| + const CopyOrMoveErrorCallback& error_callback,
|
| + const CopyProgressCallback& progress_callback,
|
| + const StatusCallback& callback);
|
| ~CopyOrMoveOperationDelegate() override;
|
|
|
| // RecursiveOperationDelegate overrides:
|
| @@ -148,6 +150,8 @@ class CopyOrMoveOperationDelegate
|
| bool same_file_system_;
|
| OperationType operation_type_;
|
| CopyOrMoveOption option_;
|
| + const bool continue_with_error_;
|
| + CopyOrMoveErrorCallback error_callback_;
|
| CopyProgressCallback progress_callback_;
|
| StatusCallback callback_;
|
|
|
|
|