Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(535)

Unified Diff: chrome/browser/sync_file_system/local/syncable_file_system_operation.cc

Issue 442383002: Move storage-related files from webkit/ to new top-level directory storage/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/local/syncable_file_system_operation.cc
diff --git a/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc b/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc
index c14aa2479225c75e9fbaaae477e8c7a367554cbf..10048a3837cc0c408f872cfccbd44bd3e28b5d2e 100644
--- a/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc
+++ b/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc
@@ -10,14 +10,14 @@
#include "chrome/browser/sync_file_system/local/syncable_file_operation_runner.h"
#include "chrome/browser/sync_file_system/syncable_file_system_util.h"
#include "net/url_request/url_request.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_operation.h"
-#include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/fileapi/file_writer_delegate.h"
-#include "webkit/common/blob/shareable_file_reference.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_operation.h"
+#include "storage/browser/fileapi/file_system_operation_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/file_writer_delegate.h"
+#include "storage/common/blob/shareable_file_reference.h"
-using fileapi::FileSystemURL;
+using storage::FileSystemURL;
namespace sync_file_system {
@@ -219,7 +219,7 @@ void SyncableFileSystemOperation::Remove(
void SyncableFileSystemOperation::Write(
const FileSystemURL& url,
- scoped_ptr<fileapi::FileWriterDelegate> writer_delegate,
+ scoped_ptr<storage::FileWriterDelegate> writer_delegate,
scoped_ptr<net::URLRequest> blob_request,
const WriteCallback& callback) {
DCHECK(CalledOnValidThread());
@@ -353,10 +353,9 @@ base::File::Error SyncableFileSystemOperation::SyncGetPlatformPath(
SyncableFileSystemOperation::SyncableFileSystemOperation(
const FileSystemURL& url,
- fileapi::FileSystemContext* file_system_context,
- scoped_ptr<fileapi::FileSystemOperationContext> operation_context)
- : url_(url),
- weak_factory_(this) {
+ storage::FileSystemContext* file_system_context,
+ scoped_ptr<storage::FileSystemOperationContext> operation_context)
+ : url_(url), weak_factory_(this) {
DCHECK(file_system_context);
SyncFileSystemBackend* backend =
SyncFileSystemBackend::GetBackend(file_system_context);
@@ -367,7 +366,7 @@ SyncableFileSystemOperation::SyncableFileSystemOperation(
// Returning here to leave operation_runner_ as NULL.
return;
}
- impl_.reset(fileapi::FileSystemOperation::Create(
+ impl_.reset(storage::FileSystemOperation::Create(
url_, file_system_context, operation_context.Pass()));
operation_runner_ = backend->sync_context()->operation_runner();
is_directory_operation_enabled_ = IsV2EnabledForOrigin(url.origin());

Powered by Google App Engine
This is Rietveld 408576698