Add fileManagerPrivate.onCopyError event.

storage/browser/fileapi/copy_or_move_operation_delegate.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef STORAGE_BROWSER_FILEAPI_COPY_OR_MOVE_OPERATION_DELEGATE_H_
 #define STORAGE_BROWSER_FILEAPI_COPY_OR_MOVE_OPERATION_DELEGATE_H_
 
 #include <set>
 #include <stack>
 
@@ skipping 18 matching lines @@
 class CopyOrMoveFileValidator;
 class FileStreamWriter;
 
 // A delegate class for recursive copy or move operations.
 class CopyOrMoveOperationDelegate
     : public RecursiveOperationDelegate {
  public:
   class CopyOrMoveImpl;
   typedef FileSystemOperation::CopyProgressCallback CopyProgressCallback;
   typedef FileSystemOperation::CopyOrMoveOption CopyOrMoveOption;
+  typedef FileSystemOperation::ErrorBehavior ErrorBehavior;
 
   enum OperationType {
     OPERATION_COPY,
     OPERATION_MOVE
   };
 
   // Helper to copy a file by reader and writer streams.
   // Export for testing.
   class STORAGE_EXPORT StreamCopyHelper {
    public:
@@ skipping 35 matching lines @@
     scoped_refptr<net::IOBufferWithSize> io_buffer_;
     int64 num_copied_bytes_;
     int64 previous_flush_offset_;
     base::Time last_progress_callback_invocation_time_;
     base::TimeDelta min_progress_callback_invocation_span_;
     bool cancel_requested_;
     base::WeakPtrFactory<StreamCopyHelper> weak_factory_;
     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 ErrorBehavior error_behavior,

[tzik, 2015/06/24 05:01:24]

nit: we usually pass enums by value without const.

[yawano, 2015/06/24 06:02:22]

Done.

+                              const CopyProgressCallback& progress_callback,
+                              const StatusCallback& callback);
   ~CopyOrMoveOperationDelegate() override;
 
   // RecursiveOperationDelegate overrides:
   void Run() override;
   void RunRecursively() override;
   void ProcessFile(const FileSystemURL& url,
                    const StatusCallback& callback) override;
   void ProcessDirectory(const FileSystemURL& url,
                         const StatusCallback& callback) override;
   void PostProcessDirectory(const FileSystemURL& url,
@@ skipping 29 matching lines @@
                               base::File::Error error);
 
   void OnCopyFileProgress(const FileSystemURL& src_url, int64 size);
   FileSystemURL CreateDestURL(const FileSystemURL& src_url) const;
 
   FileSystemURL src_root_;
   FileSystemURL dest_root_;
   bool same_file_system_;
   OperationType operation_type_;
   CopyOrMoveOption option_;
+  const ErrorBehavior error_behavior_;
   CopyProgressCallback progress_callback_;
   StatusCallback callback_;
 
   std::set<CopyOrMoveImpl*> running_copy_set_;
   base::WeakPtrFactory<CopyOrMoveOperationDelegate> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CopyOrMoveOperationDelegate);
 };
 
 }  // namespace storage
 
 #endif  // STORAGE_BROWSER_FILEAPI_COPY_OR_MOVE_OPERATION_DELEGATE_H_