| Index: storage/browser/fileapi/external_mount_points.h
|
| diff --git a/webkit/browser/fileapi/external_mount_points.h b/storage/browser/fileapi/external_mount_points.h
|
| similarity index 91%
|
| rename from webkit/browser/fileapi/external_mount_points.h
|
| rename to storage/browser/fileapi/external_mount_points.h
|
| index 7891375dcfeb675bb486f7e6b995713674f6917d..289135e64415661b2d052ae7f03b1ee964728109 100644
|
| --- a/webkit/browser/fileapi/external_mount_points.h
|
| +++ b/storage/browser/fileapi/external_mount_points.h
|
| @@ -11,16 +11,16 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/synchronization/lock.h"
|
| -#include "webkit/browser/fileapi/mount_points.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| -#include "webkit/common/fileapi/file_system_mount_option.h"
|
| -#include "webkit/common/fileapi/file_system_types.h"
|
| +#include "storage/browser/fileapi/mount_points.h"
|
| +#include "storage/common/storage_export.h"
|
| +#include "storage/common/fileapi/file_system_mount_option.h"
|
| +#include "storage/common/fileapi/file_system_types.h"
|
|
|
| namespace base {
|
| class FilePath;
|
| }
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
|
|
| class FileSystemURL;
|
|
|
| @@ -30,7 +30,7 @@ class FileSystemURL;
|
| //
|
| // filesystem:<origin>/external/<mount_name>/relative/path
|
| //
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT ExternalMountPoints
|
| +class STORAGE_EXPORT ExternalMountPoints
|
| : public base::RefCountedThreadSafe<ExternalMountPoints>,
|
| public MountPoints {
|
| public:
|
| @@ -105,10 +105,9 @@ class WEBKIT_STORAGE_BROWSER_EXPORT ExternalMountPoints
|
| // Returns the virtual root path that looks like /<mount_name>.
|
| base::FilePath CreateVirtualRootPath(const std::string& mount_name) const;
|
|
|
| - FileSystemURL CreateExternalFileSystemURL(
|
| - const GURL& origin,
|
| - const std::string& mount_name,
|
| - const base::FilePath& path) const;
|
| + FileSystemURL CreateExternalFileSystemURL(const GURL& origin,
|
| + const std::string& mount_name,
|
| + const base::FilePath& path) const;
|
|
|
| // Revoke all registered filesystems. Used only by testing (for clean-ups).
|
| void RevokeAllFileSystems();
|
| @@ -154,6 +153,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT ExternalMountPoints
|
| DISALLOW_COPY_AND_ASSIGN(ExternalMountPoints);
|
| };
|
|
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_BROWSER_FILEAPI_EXTERNAL_MOUNT_POINTS_H_
|
|
|