Add fileManagerPrivate.onCopyError event.

storage/browser/fileapi/file_system_operation_runner.cc

 // Copyright 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.
 
 #include "storage/browser/fileapi/file_system_operation_runner.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 68 matching lines @@
       url, exclusive, recursive,
       base::Bind(&FileSystemOperationRunner::DidFinish, AsWeakPtr(),
                  handle, callback));
   return handle.id;
 }
 
 OperationID FileSystemOperationRunner::Copy(
     const FileSystemURL& src_url,
     const FileSystemURL& dest_url,
     CopyOrMoveOption option,
+    const bool continue_with_error,
+    const CopyOrMoveErrorCallback& error_callback,
     const CopyProgressCallback& progress_callback,
     const StatusCallback& callback) {
   base::File::Error error = base::File::FILE_OK;
   FileSystemOperation* operation =
       file_system_context_->CreateFileSystemOperation(dest_url, &error);
   BeginOperationScoper scope;
   OperationHandle handle = BeginOperation(operation, scope.AsWeakPtr());
   if (!operation) {
     DidFinish(handle, callback, error);
     return handle.id;
   }
   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));
+      src_url, dest_url, option, continue_with_error,
+      error_callback.is_null()
+          ? CopyOrMoveErrorCallback()
+          : base::Bind(&FileSystemOperationRunner::OnCopyOrMoveError,
+                       AsWeakPtr(), handle, error_callback),
+      progress_callback.is_null()
+          ? CopyProgressCallback()
+          : base::Bind(&FileSystemOperationRunner::OnCopyProgress, AsWeakPtr(),
+                       handle, progress_callback),
+      base::Bind(&FileSystemOperationRunner::DidFinish, AsWeakPtr(), handle,
+                 callback));
   return handle.id;
 }
 
 OperationID FileSystemOperationRunner::Move(
     const FileSystemURL& src_url,
     const FileSystemURL& dest_url,
     CopyOrMoveOption option,
     const StatusCallback& callback) {
   base::File::Error error = base::File::FILE_OK;
   FileSystemOperation* operation =
@@ skipping 484 matching lines @@
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&FileSystemOperationRunner::DidCreateSnapshot,
                               AsWeakPtr(), handle, callback, rv, file_info,
                               platform_path, file_ref));
     return;
   }
   callback.Run(rv, file_info, platform_path, file_ref);
   FinishOperation(handle.id);
 }
 
+void FileSystemOperationRunner::OnCopyOrMoveError(
+    const OperationHandle& handle,
+    const CopyOrMoveErrorCallback& callback,
+    base::File::Error error,
+    const FileSystemURL& source_url,
+    const FileSystemURL& dest_url) {
+  if (handle.scope) {
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE,
+        base::Bind(&FileSystemOperationRunner::OnCopyOrMoveError, AsWeakPtr(),
+                   handle, callback, error, source_url, dest_url));
+    return;
+  }
+  callback.Run(error, source_url, dest_url);
+}
+
 void FileSystemOperationRunner::OnCopyProgress(
     const OperationHandle& handle,
     const CopyProgressCallback& callback,
     FileSystemOperation::CopyProgressType type,
     const FileSystemURL& source_url,
     const FileSystemURL& dest_url,
     int64 size) {
   if (handle.scope) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(
@@ skipping 56 matching lines @@
       stray_cancel_callbacks_.find(id);
   if (found_cancel != stray_cancel_callbacks_.end()) {
     // This cancel has been requested after the operation has finished,
     // so report that we failed to stop it.
     found_cancel->second.Run(base::File::FILE_ERROR_INVALID_OPERATION);
     stray_cancel_callbacks_.erase(found_cancel);
   }
 }
 
 }  // namespace storage