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

Unified Diff: chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h

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/media_file_system_mount_point_provider.h
diff --git a/webkit/fileapi/media/media_file_system_mount_point_provider.h b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h
similarity index 49%
rename from webkit/fileapi/media/media_file_system_mount_point_provider.h
rename to chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h
index 03135dd6e271f0660662376d25011a65eaaa9b1b..27c6004cc4cf0493c31b5f235ff4eaf5062ac6ba 100644
--- a/webkit/fileapi/media/media_file_system_mount_point_provider.h
+++ b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h
@@ -2,23 +2,27 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_FILEAPI_MEDIA_MEDIA_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_
-#define WEBKIT_FILEAPI_MEDIA_MEDIA_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_
+#ifndef CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_MEDIA_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_
+#define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_MEDIA_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_
#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/media_galleries/fileapi/mtp_device_file_system_config.h"
#include "webkit/fileapi/file_system_mount_point_provider.h"
-#include "webkit/fileapi/media/mtp_device_file_system_config.h"
namespace fileapi {
-
class AsyncFileUtilAdapter;
+}
+
+namespace chrome {
+
class MediaPathFilter;
#if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
class DeviceMediaAsyncFileUtil;
#endif
-class MediaFileSystemMountPointProvider : public FileSystemMountPointProvider {
+class MediaFileSystemMountPointProvider
+ : public fileapi::FileSystemMountPointProvider {
public:
static const char kMediaPathFilterKey[];
static const char kMTPDeviceDelegateURLKey[];
@@ -28,44 +32,46 @@ class MediaFileSystemMountPointProvider : public FileSystemMountPointProvider {
virtual ~MediaFileSystemMountPointProvider();
// FileSystemMountPointProvider implementation.
- virtual bool CanHandleType(FileSystemType type) const OVERRIDE;
+ virtual bool CanHandleType(fileapi::FileSystemType type) const OVERRIDE;
virtual void ValidateFileSystemRoot(
const GURL& origin_url,
- FileSystemType type,
+ fileapi::FileSystemType type,
bool create,
const ValidateFileSystemCallback& callback) OVERRIDE;
virtual base::FilePath GetFileSystemRootPathOnFileThread(
- const FileSystemURL& url,
+ const fileapi::FileSystemURL& url,
bool create) OVERRIDE;
- virtual FileSystemFileUtil* GetFileUtil(FileSystemType type) OVERRIDE;
- virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) OVERRIDE;
- virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
- FileSystemType type,
+ virtual fileapi::FileSystemFileUtil* GetFileUtil(
+ fileapi::FileSystemType type) OVERRIDE;
+ virtual fileapi::AsyncFileUtil* GetAsyncFileUtil(
+ fileapi::FileSystemType type) OVERRIDE;
+ virtual fileapi::CopyOrMoveFileValidatorFactory*
+ GetCopyOrMoveFileValidatorFactory(
+ fileapi::FileSystemType type,
base::PlatformFileError* error_code) OVERRIDE;
virtual void InitializeCopyOrMoveFileValidatorFactory(
- FileSystemType type,
- scoped_ptr<CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
- virtual FilePermissionPolicy GetPermissionPolicy(
- const FileSystemURL& url,
- int permissions) const OVERRIDE;
- virtual FileSystemOperation* CreateFileSystemOperation(
- const FileSystemURL& url,
- FileSystemContext* context,
+ fileapi::FileSystemType type,
+ scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
+ virtual fileapi::FilePermissionPolicy GetPermissionPolicy(
+ const fileapi::FileSystemURL& url, int permissions) const OVERRIDE;
+ virtual fileapi::FileSystemOperation* CreateFileSystemOperation(
+ const fileapi::FileSystemURL& url,
+ fileapi::FileSystemContext* context,
base::PlatformFileError* error_code) const OVERRIDE;
virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
- const FileSystemURL& url,
+ const fileapi::FileSystemURL& url,
int64 offset,
const base::Time& expected_modification_time,
- FileSystemContext* context) const OVERRIDE;
- virtual scoped_ptr<FileStreamWriter> CreateFileStreamWriter(
- const FileSystemURL& url,
+ fileapi::FileSystemContext* context) const OVERRIDE;
+ virtual scoped_ptr<fileapi::FileStreamWriter> CreateFileStreamWriter(
+ const fileapi::FileSystemURL& url,
int64 offset,
- FileSystemContext* context) const OVERRIDE;
- virtual FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
+ fileapi::FileSystemContext* context) const OVERRIDE;
+ virtual fileapi::FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
virtual void DeleteFileSystem(
const GURL& origin_url,
- FileSystemType type,
- FileSystemContext* context,
+ fileapi::FileSystemType type,
+ fileapi::FileSystemContext* context,
const DeleteFileSystemCallback& callback) OVERRIDE;
private:
@@ -73,10 +79,10 @@ class MediaFileSystemMountPointProvider : public FileSystemMountPointProvider {
const base::FilePath profile_path_;
scoped_ptr<MediaPathFilter> media_path_filter_;
- scoped_ptr<CopyOrMoveFileValidatorFactory>
+ scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory>
media_copy_or_move_file_validator_factory_;
- scoped_ptr<AsyncFileUtilAdapter> native_media_file_util_;
+ scoped_ptr<fileapi::AsyncFileUtilAdapter> native_media_file_util_;
#if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
scoped_ptr<DeviceMediaAsyncFileUtil> device_media_async_file_util_;
#endif
@@ -84,6 +90,6 @@ class MediaFileSystemMountPointProvider : public FileSystemMountPointProvider {
DISALLOW_COPY_AND_ASSIGN(MediaFileSystemMountPointProvider);
};
-} // namespace fileapi
+} // namespace chrome
-#endif // WEBKIT_FILEAPI_MEDIA_MEDIA_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_
+#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_MEDIA_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_

Powered by Google App Engine
This is Rietveld 408576698