| Index: storage/browser/fileapi/file_system_quota_client.h
|
| diff --git a/webkit/browser/fileapi/file_system_quota_client.h b/storage/browser/fileapi/file_system_quota_client.h
|
| similarity index 62%
|
| rename from webkit/browser/fileapi/file_system_quota_client.h
|
| rename to storage/browser/fileapi/file_system_quota_client.h
|
| index f3cf68ddf13559c40e7acf4a5ac82f54c8b92ab7..61b1bd57c8236f991cf9090f2af1e752950a5880 100644
|
| --- a/webkit/browser/fileapi/file_system_quota_client.h
|
| +++ b/storage/browser/fileapi/file_system_quota_client.h
|
| @@ -13,16 +13,16 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/files/file_path.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "webkit/browser/fileapi/file_system_quota_util.h"
|
| -#include "webkit/browser/quota/quota_client.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| -#include "webkit/common/fileapi/file_system_types.h"
|
| +#include "storage/browser/fileapi/file_system_quota_util.h"
|
| +#include "storage/browser/quota/quota_client.h"
|
| +#include "storage/common/storage_export.h"
|
| +#include "storage/common/fileapi/file_system_types.h"
|
|
|
| namespace base {
|
| class SequencedTaskRunner;
|
| }
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
|
|
| class FileSystemContext;
|
|
|
| @@ -31,12 +31,11 @@ class FileSystemContext;
|
| // is called.
|
| // All of the public methods of this class are called by the quota manager
|
| // (except for the constructor/destructor).
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemQuotaClient
|
| +class STORAGE_EXPORT_PRIVATE FileSystemQuotaClient
|
| : public NON_EXPORTED_BASE(quota::QuotaClient) {
|
| public:
|
| - FileSystemQuotaClient(
|
| - FileSystemContext* file_system_context,
|
| - bool is_incognito);
|
| + FileSystemQuotaClient(FileSystemContext* file_system_context,
|
| + bool is_incognito);
|
| virtual ~FileSystemQuotaClient();
|
|
|
| // QuotaClient methods.
|
| @@ -45,17 +44,14 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemQuotaClient
|
| virtual void GetOriginUsage(const GURL& origin_url,
|
| quota::StorageType type,
|
| const GetUsageCallback& callback) OVERRIDE;
|
| - virtual void GetOriginsForType(
|
| - quota::StorageType type,
|
| - const GetOriginsCallback& callback) OVERRIDE;
|
| - virtual void GetOriginsForHost(
|
| - quota::StorageType type,
|
| - const std::string& host,
|
| - const GetOriginsCallback& callback) OVERRIDE;
|
| - virtual void DeleteOriginData(
|
| - const GURL& origin,
|
| - quota::StorageType type,
|
| - const DeletionCallback& callback) OVERRIDE;
|
| + virtual void GetOriginsForType(quota::StorageType type,
|
| + const GetOriginsCallback& callback) OVERRIDE;
|
| + virtual void GetOriginsForHost(quota::StorageType type,
|
| + const std::string& host,
|
| + const GetOriginsCallback& callback) OVERRIDE;
|
| + virtual void DeleteOriginData(const GURL& origin,
|
| + quota::StorageType type,
|
| + const DeletionCallback& callback) OVERRIDE;
|
| virtual bool DoesSupport(quota::StorageType type) const OVERRIDE;
|
|
|
| private:
|
| @@ -68,6 +64,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemQuotaClient
|
| DISALLOW_COPY_AND_ASSIGN(FileSystemQuotaClient);
|
| };
|
|
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_QUOTA_CLIENT_H_
|
|
|