| Index: webkit/fileapi/media/media_file_system_mount_point_provider.h
|
| diff --git a/webkit/fileapi/isolated_mount_point_provider.h b/webkit/fileapi/media/media_file_system_mount_point_provider.h
|
| similarity index 83%
|
| copy from webkit/fileapi/isolated_mount_point_provider.h
|
| copy to webkit/fileapi/media/media_file_system_mount_point_provider.h
|
| index 9de55639d83aa0ca501ba85d51655651e080b0e8..03135dd6e271f0660662376d25011a65eaaa9b1b 100644
|
| --- a/webkit/fileapi/isolated_mount_point_provider.h
|
| +++ b/webkit/fileapi/media/media_file_system_mount_point_provider.h
|
| @@ -1,9 +1,9 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_
|
| -#define WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_
|
| +#ifndef WEBKIT_FILEAPI_MEDIA_MEDIA_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_
|
| +#define WEBKIT_FILEAPI_MEDIA_MEDIA_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "webkit/fileapi/file_system_mount_point_provider.h"
|
| @@ -12,20 +12,20 @@
|
| namespace fileapi {
|
|
|
| class AsyncFileUtilAdapter;
|
| -class IsolatedContext;
|
| class MediaPathFilter;
|
|
|
| #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
|
| class DeviceMediaAsyncFileUtil;
|
| #endif
|
|
|
| -class IsolatedMountPointProvider : public FileSystemMountPointProvider {
|
| +class MediaFileSystemMountPointProvider : public FileSystemMountPointProvider {
|
| public:
|
| static const char kMediaPathFilterKey[];
|
| static const char kMTPDeviceDelegateURLKey[];
|
|
|
| - explicit IsolatedMountPointProvider(const base::FilePath& profile_path);
|
| - virtual ~IsolatedMountPointProvider();
|
| + explicit MediaFileSystemMountPointProvider(
|
| + const base::FilePath& profile_path);
|
| + virtual ~MediaFileSystemMountPointProvider();
|
|
|
| // FileSystemMountPointProvider implementation.
|
| virtual bool CanHandleType(FileSystemType type) const OVERRIDE;
|
| @@ -76,15 +76,14 @@ class IsolatedMountPointProvider : public FileSystemMountPointProvider {
|
| scoped_ptr<CopyOrMoveFileValidatorFactory>
|
| media_copy_or_move_file_validator_factory_;
|
|
|
| - scoped_ptr<AsyncFileUtilAdapter> isolated_file_util_;
|
| - scoped_ptr<AsyncFileUtilAdapter> dragged_file_util_;
|
| scoped_ptr<AsyncFileUtilAdapter> native_media_file_util_;
|
| -
|
| #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
|
| scoped_ptr<DeviceMediaAsyncFileUtil> device_media_async_file_util_;
|
| #endif
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(MediaFileSystemMountPointProvider);
|
| };
|
|
|
| } // namespace fileapi
|
|
|
| -#endif // WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_
|
| +#endif // WEBKIT_FILEAPI_MEDIA_MEDIA_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_
|
|
|