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

Unified Diff: storage/browser/fileapi/dragged_file_util.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
« no previous file with comments | « storage/browser/fileapi/dragged_file_util.h ('k') | storage/browser/fileapi/dump_file_system.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: storage/browser/fileapi/dragged_file_util.cc
diff --git a/webkit/browser/fileapi/dragged_file_util.cc b/storage/browser/fileapi/dragged_file_util.cc
similarity index 76%
rename from webkit/browser/fileapi/dragged_file_util.cc
rename to storage/browser/fileapi/dragged_file_util.cc
index 0243b3d15d8df6ea88a2a550e2e7117579ef30c2..bcfbc85a36e3e3378e65f53a443ed669d3d21428 100644
--- a/webkit/browser/fileapi/dragged_file_util.cc
+++ b/storage/browser/fileapi/dragged_file_util.cc
@@ -2,20 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/browser/fileapi/dragged_file_util.h"
+#include "storage/browser/fileapi/dragged_file_util.h"
#include <string>
#include <vector>
#include "base/file_util.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/fileapi/isolated_context.h"
-#include "webkit/browser/fileapi/native_file_util.h"
-#include "webkit/common/blob/shareable_file_reference.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_operation_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/isolated_context.h"
+#include "storage/browser/fileapi/native_file_util.h"
+#include "storage/common/blob/shareable_file_reference.h"
-namespace fileapi {
+namespace storage {
typedef IsolatedContext::MountPointInfo FileInfo;
@@ -55,7 +55,8 @@ class SetFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
//-------------------------------------------------------------------------
-DraggedFileUtil::DraggedFileUtil() {}
+DraggedFileUtil::DraggedFileUtil() {
+}
base::File::Error DraggedFileUtil::GetFileInfo(
FileSystemOperationContext* context,
@@ -76,8 +77,7 @@ base::File::Error DraggedFileUtil::GetFileInfo(
file_info->size = 0;
return base::File::FILE_OK;
}
- base::File::Error error =
- NativeFileUtil::GetFileInfo(url.path(), file_info);
+ base::File::Error error = NativeFileUtil::GetFileInfo(url.path(), file_info);
if (base::IsLink(url.path()) && !base::FilePath().IsParent(url.path())) {
// Don't follow symlinks unless it's the one that are selected by the user.
return base::File::FILE_ERROR_NOT_FOUND;
@@ -88,18 +88,17 @@ base::File::Error DraggedFileUtil::GetFileInfo(
}
scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>
- DraggedFileUtil::CreateFileEnumerator(
- FileSystemOperationContext* context,
- const FileSystemURL& root) {
+DraggedFileUtil::CreateFileEnumerator(FileSystemOperationContext* context,
+ const FileSystemURL& root) {
DCHECK(root.is_valid());
if (!root.path().empty())
return LocalFileUtil::CreateFileEnumerator(context, root);
// Root path case.
std::vector<FileInfo> toplevels;
- IsolatedContext::GetInstance()->GetDraggedFileInfo(
- root.filesystem_id(), &toplevels);
+ IsolatedContext::GetInstance()->GetDraggedFileInfo(root.filesystem_id(),
+ &toplevels);
return scoped_ptr<AbstractFileEnumerator>(new SetFileEnumerator(toplevels));
}
-} // namespace fileapi
+} // namespace storage
« no previous file with comments | « storage/browser/fileapi/dragged_file_util.h ('k') | storage/browser/fileapi/dump_file_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698