| Index: chrome/browser/media_galleries/fileapi/native_media_file_util.h
|
| diff --git a/webkit/fileapi/media/native_media_file_util.h b/chrome/browser/media_galleries/fileapi/native_media_file_util.h
|
| similarity index 56%
|
| rename from webkit/fileapi/media/native_media_file_util.h
|
| rename to chrome/browser/media_galleries/fileapi/native_media_file_util.h
|
| index 0b957c3f28b94aae5ce6bba3e116fd8e169dd207..aa4ee62299b5e0c053efa9fb484205b77419fb48 100644
|
| --- a/webkit/fileapi/media/native_media_file_util.h
|
| +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util.h
|
| @@ -2,59 +2,57 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_FILEAPI_MEDIA_NATIVE_MEDIA_FILE_UTIL_H_
|
| -#define WEBKIT_FILEAPI_MEDIA_NATIVE_MEDIA_FILE_UTIL_H_
|
| +#ifndef CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_NATIVE_MEDIA_FILE_UTIL_H_
|
| +#define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_NATIVE_MEDIA_FILE_UTIL_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "webkit/fileapi/isolated_file_util.h"
|
| -#include "webkit/storage/webkit_storage_export.h"
|
|
|
| -namespace fileapi {
|
| +namespace chrome {
|
|
|
| // This class handles native file system operations with media type filtering
|
| -// which is passed to each method via FileSystemOperationContext as
|
| +// which is passed to each method via fileapi::FileSystemOperationContext as
|
| // MediaPathFilter.
|
| -class WEBKIT_STORAGE_EXPORT_PRIVATE NativeMediaFileUtil
|
| - : public IsolatedFileUtil {
|
| +class NativeMediaFileUtil : public fileapi::IsolatedFileUtil {
|
| public:
|
| NativeMediaFileUtil();
|
|
|
| virtual base::PlatformFileError CreateOrOpen(
|
| - FileSystemOperationContext* context,
|
| - const FileSystemURL& url,
|
| + fileapi::FileSystemOperationContext* context,
|
| + const fileapi::FileSystemURL& url,
|
| int file_flags,
|
| base::PlatformFile* file_handle,
|
| bool* created) OVERRIDE;
|
| virtual base::PlatformFileError EnsureFileExists(
|
| - FileSystemOperationContext* context,
|
| - const FileSystemURL& url, bool* created) OVERRIDE;
|
| + fileapi::FileSystemOperationContext* context,
|
| + const fileapi::FileSystemURL& url, bool* created) OVERRIDE;
|
| virtual scoped_ptr<AbstractFileEnumerator> CreateFileEnumerator(
|
| - FileSystemOperationContext* context,
|
| - const FileSystemURL& root_url) OVERRIDE;
|
| + fileapi::FileSystemOperationContext* context,
|
| + const fileapi::FileSystemURL& root_url) OVERRIDE;
|
| virtual base::PlatformFileError Touch(
|
| - FileSystemOperationContext* context,
|
| - const FileSystemURL& url,
|
| + fileapi::FileSystemOperationContext* context,
|
| + const fileapi::FileSystemURL& url,
|
| const base::Time& last_access_time,
|
| const base::Time& last_modified_time) OVERRIDE;
|
| virtual base::PlatformFileError Truncate(
|
| - FileSystemOperationContext* context,
|
| - const FileSystemURL& url,
|
| + fileapi::FileSystemOperationContext* context,
|
| + const fileapi::FileSystemURL& url,
|
| int64 length) OVERRIDE;
|
| virtual base::PlatformFileError CopyOrMoveFile(
|
| - FileSystemOperationContext* context,
|
| - const FileSystemURL& src_url,
|
| - const FileSystemURL& dest_url,
|
| + fileapi::FileSystemOperationContext* context,
|
| + const fileapi::FileSystemURL& src_url,
|
| + const fileapi::FileSystemURL& dest_url,
|
| bool copy) OVERRIDE;
|
| virtual base::PlatformFileError CopyInForeignFile(
|
| - FileSystemOperationContext* context,
|
| + fileapi::FileSystemOperationContext* context,
|
| const base::FilePath& src_file_path,
|
| - const FileSystemURL& dest_url) OVERRIDE;
|
| + const fileapi::FileSystemURL& dest_url) OVERRIDE;
|
| virtual base::PlatformFileError DeleteFile(
|
| - FileSystemOperationContext* context,
|
| - const FileSystemURL& url) OVERRIDE;
|
| + fileapi::FileSystemOperationContext* context,
|
| + const fileapi::FileSystemURL& url) OVERRIDE;
|
| virtual base::PlatformFileError GetFileInfo(
|
| - FileSystemOperationContext* context,
|
| - const FileSystemURL& url,
|
| + fileapi::FileSystemOperationContext* context,
|
| + const fileapi::FileSystemURL& url,
|
| base::PlatformFileInfo* file_info,
|
| base::FilePath* platform_path) OVERRIDE;
|
|
|
| @@ -63,8 +61,8 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE NativeMediaFileUtil
|
| // consideration. If the media_path_filter() check fails, return
|
| // PLATFORM_FILE_ERROR_SECURITY. |local_file_path| does not have to exist.
|
| base::PlatformFileError GetFilteredLocalFilePath(
|
| - FileSystemOperationContext* context,
|
| - const FileSystemURL& file_system_url,
|
| + fileapi::FileSystemOperationContext* context,
|
| + const fileapi::FileSystemURL& file_system_url,
|
| base::FilePath* local_file_path);
|
|
|
| // Like GetLocalFilePath(), but if the file does not exist, then return
|
| @@ -74,14 +72,14 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE NativeMediaFileUtil
|
| // If the media_path_filter() check fails, return |failure_error|.
|
| // If |local_file_path| is a directory, return PLATFORM_FILE_OK.
|
| base::PlatformFileError GetFilteredLocalFilePathForExistingFileOrDirectory(
|
| - FileSystemOperationContext* context,
|
| - const FileSystemURL& file_system_url,
|
| + fileapi::FileSystemOperationContext* context,
|
| + const fileapi::FileSystemURL& file_system_url,
|
| base::PlatformFileError failure_error,
|
| base::FilePath* local_file_path);
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NativeMediaFileUtil);
|
| };
|
|
|
| -} // namespace fileapi
|
| +} // namespace chrome
|
|
|
| -#endif // WEBKIT_FILEAPI_MEDIA_NATIVE_MEDIA_FILE_UTIL_H_
|
| +#endif // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_NATIVE_MEDIA_FILE_UTIL_H_
|
|
|