| Index: storage/browser/fileapi/quota/quota_backend_impl.h
|
| diff --git a/webkit/browser/fileapi/quota/quota_backend_impl.h b/storage/browser/fileapi/quota/quota_backend_impl.h
|
| similarity index 49%
|
| rename from webkit/browser/fileapi/quota/quota_backend_impl.h
|
| rename to storage/browser/fileapi/quota/quota_backend_impl.h
|
| index ec4c45ac18b4eb726f06b175a5c17e7925ec438c..eb54fc6f71c673fb80c2d5a629b05a316af2c260 100644
|
| --- a/webkit/browser/fileapi/quota/quota_backend_impl.h
|
| +++ b/storage/browser/fileapi/quota/quota_backend_impl.h
|
| @@ -7,10 +7,10 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "webkit/browser/fileapi/quota/quota_reservation_manager.h"
|
| -#include "webkit/browser/fileapi/sandbox_file_system_backend_delegate.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| -#include "webkit/common/quota/quota_status_code.h"
|
| +#include "storage/browser/fileapi/quota/quota_reservation_manager.h"
|
| +#include "storage/browser/fileapi/sandbox_file_system_backend_delegate.h"
|
| +#include "storage/common/storage_export.h"
|
| +#include "storage/common/quota/quota_status_code.h"
|
|
|
| namespace base {
|
| class SequencedTaskRunner;
|
| @@ -24,17 +24,16 @@ namespace quota {
|
| class QuotaManagerProxy;
|
| }
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
|
|
| class FileSystemUsageCache;
|
| class ObfuscatedFileUtil;
|
|
|
| // An instance of this class is owned by QuotaReservationManager.
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT QuotaBackendImpl
|
| +class STORAGE_EXPORT QuotaBackendImpl
|
| : public QuotaReservationManager::QuotaBackend {
|
| public:
|
| - typedef QuotaReservationManager::ReserveQuotaCallback
|
| - ReserveQuotaCallback;
|
| + typedef QuotaReservationManager::ReserveQuotaCallback ReserveQuotaCallback;
|
|
|
| QuotaBackendImpl(base::SequencedTaskRunner* file_task_runner,
|
| ObfuscatedFileUtil* obfuscated_file_util,
|
| @@ -43,25 +42,20 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaBackendImpl
|
| virtual ~QuotaBackendImpl();
|
|
|
| // QuotaReservationManager::QuotaBackend overrides.
|
| - virtual void ReserveQuota(
|
| - const GURL& origin,
|
| - FileSystemType type,
|
| - int64 delta,
|
| - const ReserveQuotaCallback& callback) OVERRIDE;
|
| - virtual void ReleaseReservedQuota(
|
| - const GURL& origin,
|
| - FileSystemType type,
|
| - int64 size) OVERRIDE;
|
| - virtual void CommitQuotaUsage(
|
| - const GURL& origin,
|
| - FileSystemType type,
|
| - int64 delta) OVERRIDE;
|
| - virtual void IncrementDirtyCount(
|
| - const GURL& origin,
|
| - FileSystemType type) OVERRIDE;
|
| - virtual void DecrementDirtyCount(
|
| - const GURL& origin,
|
| - FileSystemType type) OVERRIDE;
|
| + virtual void ReserveQuota(const GURL& origin,
|
| + FileSystemType type,
|
| + int64 delta,
|
| + const ReserveQuotaCallback& callback) OVERRIDE;
|
| + virtual void ReleaseReservedQuota(const GURL& origin,
|
| + FileSystemType type,
|
| + int64 size) OVERRIDE;
|
| + virtual void CommitQuotaUsage(const GURL& origin,
|
| + FileSystemType type,
|
| + int64 delta) OVERRIDE;
|
| + virtual void IncrementDirtyCount(const GURL& origin,
|
| + FileSystemType type) OVERRIDE;
|
| + virtual void DecrementDirtyCount(const GURL& origin,
|
| + FileSystemType type) OVERRIDE;
|
|
|
| private:
|
| friend class content::QuotaBackendImplTest;
|
| @@ -75,19 +69,16 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaBackendImpl
|
| int64 delta;
|
| };
|
|
|
| - void DidGetUsageAndQuotaForReserveQuota(
|
| - const QuotaReservationInfo& info,
|
| - const ReserveQuotaCallback& callback,
|
| - quota::QuotaStatusCode status,
|
| - int64 usage,
|
| - int64 quota);
|
| + void DidGetUsageAndQuotaForReserveQuota(const QuotaReservationInfo& info,
|
| + const ReserveQuotaCallback& callback,
|
| + quota::QuotaStatusCode status,
|
| + int64 usage,
|
| + int64 quota);
|
|
|
| - void ReserveQuotaInternal(
|
| - const QuotaReservationInfo& info);
|
| - base::File::Error GetUsageCachePath(
|
| - const GURL& origin,
|
| - FileSystemType type,
|
| - base::FilePath* usage_file_path);
|
| + void ReserveQuotaInternal(const QuotaReservationInfo& info);
|
| + base::File::Error GetUsageCachePath(const GURL& origin,
|
| + FileSystemType type,
|
| + base::FilePath* usage_file_path);
|
|
|
| scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
|
|
|
| @@ -102,6 +93,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaBackendImpl
|
| DISALLOW_COPY_AND_ASSIGN(QuotaBackendImpl);
|
| };
|
|
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_BROWSER_FILEAPI_QUOTA_QUOTA_BACKEND_IMPL_H_
|
|
|