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

Unified Diff: chrome/browser/media_galleries/fileapi/native_media_file_util.cc

Issue 14247034: Move Media Galleries FileAPI code out of webkit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cr-14352004
Patch Set: Add android ifdef. Created 7 years, 8 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/media_galleries/fileapi/native_media_file_util.cc
diff --git a/webkit/fileapi/media/native_media_file_util.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util.cc
similarity index 93%
rename from webkit/fileapi/media/native_media_file_util.cc
rename to chrome/browser/media_galleries/fileapi/native_media_file_util.cc
index fa5087d6712595036f6d345a96e84aab694164bb..19724f94a1bb5a7d2b40abc90653bdbc78da510c 100644
--- a/webkit/fileapi/media/native_media_file_util.cc
+++ b/chrome/browser/media_galleries/fileapi/native_media_file_util.cc
@@ -2,19 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/fileapi/media/native_media_file_util.h"
+#include "chrome/browser/media_galleries/fileapi/native_media_file_util.h"
+#include "chrome/browser/media_galleries/fileapi/filtering_file_enumerator.h"
+#include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h"
+#include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
#include "webkit/fileapi/file_system_operation_context.h"
-#include "webkit/fileapi/media/filtering_file_enumerator.h"
-#include "webkit/fileapi/media/media_file_system_mount_point_provider.h"
-#include "webkit/fileapi/media/media_path_filter.h"
#include "webkit/fileapi/native_file_util.h"
using base::PlatformFile;
using base::PlatformFileError;
using base::PlatformFileInfo;
+using fileapi::FileSystemOperationContext;
+using fileapi::FileSystemURL;
+using fileapi::NativeFileUtil;
-namespace fileapi {
+namespace chrome {
namespace {
@@ -48,7 +51,7 @@ PlatformFileError NativeMediaFileUtil::EnsureFileExists(
return NativeFileUtil::EnsureFileExists(file_path, created);
}
-scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>
+scoped_ptr<fileapi::FileSystemFileUtil::AbstractFileEnumerator>
NativeMediaFileUtil::CreateFileEnumerator(
FileSystemOperationContext* context,
const FileSystemURL& root_url) {
@@ -223,4 +226,4 @@ NativeMediaFileUtil::GetFilteredLocalFilePathForExistingFileOrDirectory(
return base::PLATFORM_FILE_OK;
}
-} // namespace fileapi
+} // namespace chrome

Powered by Google App Engine
This is Rietveld 408576698