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

Unified Diff: storage/browser/fileapi/isolated_file_system_backend.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: storage/browser/fileapi/isolated_file_system_backend.cc
diff --git a/webkit/browser/fileapi/isolated_file_system_backend.cc b/storage/browser/fileapi/isolated_file_system_backend.cc
similarity index 67%
rename from webkit/browser/fileapi/isolated_file_system_backend.cc
rename to storage/browser/fileapi/isolated_file_system_backend.cc
index 33c22cb77e7d293d421e58d91dd37adf2b33fd33..4e1cb16a664c0aefa3bae7d813ad3e9044e116d7 100644
--- a/webkit/browser/fileapi/isolated_file_system_backend.cc
+++ b/storage/browser/fileapi/isolated_file_system_backend.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/browser/fileapi/isolated_file_system_backend.h"
+#include "storage/browser/fileapi/isolated_file_system_backend.h"
#include <string>
@@ -12,21 +12,21 @@
#include "base/logging.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/sequenced_task_runner.h"
-#include "webkit/browser/blob/file_stream_reader.h"
-#include "webkit/browser/fileapi/async_file_util_adapter.h"
-#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
-#include "webkit/browser/fileapi/dragged_file_util.h"
-#include "webkit/browser/fileapi/file_stream_writer.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/isolated_context.h"
-#include "webkit/browser/fileapi/native_file_util.h"
-#include "webkit/browser/fileapi/transient_file_util.h"
-#include "webkit/common/fileapi/file_system_types.h"
-#include "webkit/common/fileapi/file_system_util.h"
-
-namespace fileapi {
+#include "storage/browser/blob/file_stream_reader.h"
+#include "storage/browser/fileapi/async_file_util_adapter.h"
+#include "storage/browser/fileapi/copy_or_move_file_validator.h"
+#include "storage/browser/fileapi/dragged_file_util.h"
+#include "storage/browser/fileapi/file_stream_writer.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/isolated_context.h"
+#include "storage/browser/fileapi/native_file_util.h"
+#include "storage/browser/fileapi/transient_file_util.h"
+#include "storage/common/fileapi/file_system_types.h"
+#include "storage/common/fileapi/file_system_util.h"
+
+namespace storage {
IsolatedFileSystemBackend::IsolatedFileSystemBackend()
: isolated_file_util_(new AsyncFileUtilAdapter(new LocalFileUtil())),
@@ -63,10 +63,8 @@ void IsolatedFileSystemBackend::ResolveURL(
// We never allow opening a new isolated FileSystem via usual ResolveURL.
base::MessageLoopProxy::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- GURL(),
- std::string(),
- base::File::FILE_ERROR_SECURITY));
+ base::Bind(
+ callback, GURL(), std::string(), base::File::FILE_ERROR_SECURITY));
}
AsyncFileUtil* IsolatedFileSystemBackend::GetAsyncFileUtil(
@@ -86,7 +84,8 @@ AsyncFileUtil* IsolatedFileSystemBackend::GetAsyncFileUtil(
CopyOrMoveFileValidatorFactory*
IsolatedFileSystemBackend::GetCopyOrMoveFileValidatorFactory(
- FileSystemType type, base::File::Error* error_code) {
+ FileSystemType type,
+ base::File::Error* error_code) {
DCHECK(error_code);
*error_code = base::File::FILE_OK;
return NULL;
@@ -101,32 +100,33 @@ FileSystemOperation* IsolatedFileSystemBackend::CreateFileSystemOperation(
}
bool IsolatedFileSystemBackend::SupportsStreaming(
- const fileapi::FileSystemURL& url) const {
+ const storage::FileSystemURL& url) const {
return false;
}
-scoped_ptr<webkit_blob::FileStreamReader>
+scoped_ptr<storage::FileStreamReader>
IsolatedFileSystemBackend::CreateFileStreamReader(
const FileSystemURL& url,
int64 offset,
const base::Time& expected_modification_time,
FileSystemContext* context) const {
- return scoped_ptr<webkit_blob::FileStreamReader>(
- webkit_blob::FileStreamReader::CreateForLocalFile(
+ return scoped_ptr<storage::FileStreamReader>(
+ storage::FileStreamReader::CreateForLocalFile(
context->default_file_task_runner(),
- url.path(), offset, expected_modification_time));
+ url.path(),
+ offset,
+ expected_modification_time));
}
scoped_ptr<FileStreamWriter> IsolatedFileSystemBackend::CreateFileStreamWriter(
const FileSystemURL& url,
int64 offset,
FileSystemContext* context) const {
- return scoped_ptr<FileStreamWriter>(
- FileStreamWriter::CreateForLocalFile(
- context->default_file_task_runner(),
- url.path(),
- offset,
- FileStreamWriter::OPEN_EXISTING_FILE));
+ return scoped_ptr<FileStreamWriter>(FileStreamWriter::CreateForLocalFile(
+ context->default_file_task_runner(),
+ url.path(),
+ offset,
+ FileStreamWriter::OPEN_EXISTING_FILE));
}
FileSystemQuotaUtil* IsolatedFileSystemBackend::GetQuotaUtil() {
@@ -134,4 +134,4 @@ FileSystemQuotaUtil* IsolatedFileSystemBackend::GetQuotaUtil() {
return NULL;
}
-} // namespace fileapi
+} // namespace storage
« no previous file with comments | « storage/browser/fileapi/isolated_file_system_backend.h ('k') | storage/browser/fileapi/local_file_stream_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698