Add fileManagerPrivate.onCopyError event.

storage/browser/fileapi/recursive_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_RECURSIVE_OPERATION_DELEGATE_H_
 #define STORAGE_BROWSER_FILEAPI_RECURSIVE_OPERATION_DELEGATE_H_
 
 #include <queue>
 #include <stack>
 
@@ skipping 10 matching lines @@
 
 // A base class for recursive operation delegates.
 //
 // In short, each subclass should override ProcessFile and ProcessDirectory
 // to process a directory or a file. To start the recursive operation it
 // should also call StartRecursiveOperation.
 class STORAGE_EXPORT RecursiveOperationDelegate
     : public base::SupportsWeakPtr<RecursiveOperationDelegate> {
  public:
   typedef FileSystemOperation::StatusCallback StatusCallback;
-  typedef FileSystemOperation::ErrorCallback ErrorCallback;
   typedef FileSystemOperation::FileEntryList FileEntryList;
+  typedef FileSystemOperation::ErrorBehavior ErrorBehavior;
 
   virtual ~RecursiveOperationDelegate();
 
   // This is called when the consumer of this instance starts a non-recursive
   // operation.
   virtual void Run() = 0;
 
   // This is called when the consumer of this instance starts a recursive
   // operation.
   virtual void RunRecursively() = 0;
@@ skipping 54 matching lines @@
   // ProcessDirectory(c1_dir).
   // ProcessFile(d1_file), ProcessFile(d2_file). (in parallel).
   // PostProcessDirectory(c1_dir)
   // PostProcessDirectory(b1_dir).
   // ProcessDirectory(b2_dir)
   // ProcessDirectory(e_dir)
   // PostProcessDirectory(e_dir)
   // PostProcessDirectory(b2_dir)
   // PostProcessDirectory(a_dir)
   //
+  // |error_behavior| is to specify how this behaves when an operation have
+  // failed.
   // |callback| is fired with base::File::FILE_OK when every file/directory
   // under |root| is processed, or fired earlier when any suboperation fails.
   void StartRecursiveOperation(const FileSystemURL& root,
+                               ErrorBehavior error_behavior,
                                const StatusCallback& callback);
 
-  // Starts to process files/directories recursively from the given |root|.
-  // Compared with StartRecursiveOperation, this continues operation with
-  // ignoring erros of ProcessFile.
-  //
-  // |error_callback| is fired when a ProcessFile has failed in the middle of
-  // operations. If some errors had happened, |status_callback| is fired with
-  // base::File::FILE_ERROR_FAILED at the end.
-  //
-  // TODO(yawano): Handle errors of ProcessDirectory as well.
-  void StartRecursiveOperationWithIgnoringError(
-      const FileSystemURL& root,
-      const ErrorCallback& error_callback,
-      const StatusCallback& status_callback);
-
   FileSystemContext* file_system_context() { return file_system_context_; }
   const FileSystemContext* file_system_context() const {
     return file_system_context_;
   }
 
   FileSystemOperationRunner* operation_runner();
 
   // Called when Cancel() is called. This is a hook to do something more
   // in a derived class. By default, do nothing.
   virtual void OnCancel();
@@ skipping 11 matching lines @@
   void ProcessPendingFiles();
   void DidProcessFile(const FileSystemURL& url, base::File::Error error);
   void ProcessSubDirectory();
   void DidPostProcessDirectory(base::File::Error error);
 
   // Called when all recursive operation is done (or an error occurs).
   void Done(base::File::Error error);
 
   FileSystemContext* file_system_context_;
   StatusCallback callback_;
-  ErrorCallback error_callback_;
   std::stack<FileSystemURL> pending_directories_;
   std::stack<std::queue<FileSystemURL> > pending_directory_stack_;
   std::queue<FileSystemURL> pending_files_;
   int inflight_operations_;
   bool canceled_;
-  bool ignore_error_;
+  ErrorBehavior error_behavior_;
   bool failed_some_operations_;
 
   DISALLOW_COPY_AND_ASSIGN(RecursiveOperationDelegate);
 };
 
 }  // namespace storage
 
 #endif  // STORAGE_BROWSER_FILEAPI_RECURSIVE_OPERATION_DELEGATE_H_