| Index: storage/browser/fileapi/remove_operation_delegate.cc
|
| diff --git a/webkit/browser/fileapi/remove_operation_delegate.cc b/storage/browser/fileapi/remove_operation_delegate.cc
|
| similarity index 70%
|
| rename from webkit/browser/fileapi/remove_operation_delegate.cc
|
| rename to storage/browser/fileapi/remove_operation_delegate.cc
|
| index 6c7b2defdf2cbba31194e55430b3125f64f42761..9f24dd023df5bf5f4b5a151eaab553b3b1ecc9f1 100644
|
| --- a/webkit/browser/fileapi/remove_operation_delegate.cc
|
| +++ b/storage/browser/fileapi/remove_operation_delegate.cc
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/browser/fileapi/remove_operation_delegate.h"
|
| +#include "storage/browser/fileapi/remove_operation_delegate.h"
|
|
|
| #include "base/bind.h"
|
| -#include "webkit/browser/fileapi/file_system_context.h"
|
| -#include "webkit/browser/fileapi/file_system_operation_runner.h"
|
| +#include "storage/browser/fileapi/file_system_context.h"
|
| +#include "storage/browser/fileapi/file_system_operation_runner.h"
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
|
|
| RemoveOperationDelegate::RemoveOperationDelegate(
|
| FileSystemContext* file_system_context,
|
| @@ -20,11 +20,14 @@ RemoveOperationDelegate::RemoveOperationDelegate(
|
| weak_factory_(this) {
|
| }
|
|
|
| -RemoveOperationDelegate::~RemoveOperationDelegate() {}
|
| +RemoveOperationDelegate::~RemoveOperationDelegate() {
|
| +}
|
|
|
| void RemoveOperationDelegate::Run() {
|
| - operation_runner()->RemoveFile(url_, base::Bind(
|
| - &RemoveOperationDelegate::DidTryRemoveFile, weak_factory_.GetWeakPtr()));
|
| + operation_runner()->RemoveFile(
|
| + url_,
|
| + base::Bind(&RemoveOperationDelegate::DidTryRemoveFile,
|
| + weak_factory_.GetWeakPtr()));
|
| }
|
|
|
| void RemoveOperationDelegate::RunRecursively() {
|
| @@ -36,7 +39,8 @@ void RemoveOperationDelegate::ProcessFile(const FileSystemURL& url,
|
| operation_runner()->RemoveFile(
|
| url,
|
| base::Bind(&RemoveOperationDelegate::DidRemoveFile,
|
| - weak_factory_.GetWeakPtr(), callback));
|
| + weak_factory_.GetWeakPtr(),
|
| + callback));
|
| }
|
|
|
| void RemoveOperationDelegate::ProcessDirectory(const FileSystemURL& url,
|
| @@ -45,7 +49,8 @@ void RemoveOperationDelegate::ProcessDirectory(const FileSystemURL& url,
|
| }
|
|
|
| void RemoveOperationDelegate::PostProcessDirectory(
|
| - const FileSystemURL& url, const StatusCallback& callback) {
|
| + const FileSystemURL& url,
|
| + const StatusCallback& callback) {
|
| operation_runner()->RemoveDirectory(url, callback);
|
| }
|
|
|
| @@ -58,16 +63,16 @@ void RemoveOperationDelegate::DidTryRemoveFile(base::File::Error error) {
|
| operation_runner()->RemoveDirectory(
|
| url_,
|
| base::Bind(&RemoveOperationDelegate::DidTryRemoveDirectory,
|
| - weak_factory_.GetWeakPtr(), error));
|
| + weak_factory_.GetWeakPtr(),
|
| + error));
|
| }
|
|
|
| void RemoveOperationDelegate::DidTryRemoveDirectory(
|
| base::File::Error remove_file_error,
|
| base::File::Error remove_directory_error) {
|
| - callback_.Run(
|
| - remove_directory_error == base::File::FILE_ERROR_NOT_A_DIRECTORY ?
|
| - remove_file_error :
|
| - remove_directory_error);
|
| + callback_.Run(remove_directory_error == base::File::FILE_ERROR_NOT_A_DIRECTORY
|
| + ? remove_file_error
|
| + : remove_directory_error);
|
| }
|
|
|
| void RemoveOperationDelegate::DidRemoveFile(const StatusCallback& callback,
|
| @@ -79,4 +84,4 @@ void RemoveOperationDelegate::DidRemoveFile(const StatusCallback& callback,
|
| callback.Run(error);
|
| }
|
|
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|