| Index: storage/browser/quota/quota_manager_proxy.h
|
| diff --git a/webkit/browser/quota/quota_manager_proxy.h b/storage/browser/quota/quota_manager_proxy.h
|
| similarity index 75%
|
| rename from webkit/browser/quota/quota_manager_proxy.h
|
| rename to storage/browser/quota/quota_manager_proxy.h
|
| index 21c97c6cd388c7e38d596b72f51aa2a4fe10c553..9422f77326d8381721f8406ff57c0e8e89ec8cc5 100644
|
| --- a/webkit/browser/quota/quota_manager_proxy.h
|
| +++ b/storage/browser/quota/quota_manager_proxy.h
|
| @@ -12,13 +12,13 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/sequenced_task_runner_helpers.h"
|
| -#include "webkit/browser/quota/quota_callbacks.h"
|
| -#include "webkit/browser/quota/quota_client.h"
|
| -#include "webkit/browser/quota/quota_database.h"
|
| -#include "webkit/browser/quota/quota_manager.h"
|
| -#include "webkit/browser/quota/quota_task.h"
|
| -#include "webkit/browser/quota/special_storage_policy.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| +#include "storage/browser/quota/quota_callbacks.h"
|
| +#include "storage/browser/quota/quota_client.h"
|
| +#include "storage/browser/quota/quota_database.h"
|
| +#include "storage/browser/quota/quota_manager.h"
|
| +#include "storage/browser/quota/quota_task.h"
|
| +#include "storage/browser/quota/special_storage_policy.h"
|
| +#include "storage/common/storage_export.h"
|
|
|
| namespace base {
|
| class SequencedTaskRunner;
|
| @@ -28,11 +28,10 @@ class SingleThreadTaskRunner;
|
| namespace quota {
|
|
|
| // The proxy may be called and finally released on any thread.
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT QuotaManagerProxy
|
| +class STORAGE_EXPORT QuotaManagerProxy
|
| : public base::RefCountedThreadSafe<QuotaManagerProxy> {
|
| public:
|
| - typedef QuotaManager::GetUsageAndQuotaCallback
|
| - GetUsageAndQuotaCallback;
|
| + typedef QuotaManager::GetUsageAndQuotaCallback GetUsageAndQuotaCallback;
|
|
|
| virtual void RegisterClient(QuotaClient* client);
|
| virtual void NotifyStorageAccessed(QuotaClient::ID client_id,
|
| @@ -49,11 +48,10 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaManagerProxy
|
| const GURL& origin,
|
| StorageType type,
|
| bool enabled);
|
| - virtual void GetUsageAndQuota(
|
| - base::SequencedTaskRunner* original_task_runner,
|
| - const GURL& origin,
|
| - StorageType type,
|
| - const GetUsageAndQuotaCallback& callback);
|
| + virtual void GetUsageAndQuota(base::SequencedTaskRunner* original_task_runner,
|
| + const GURL& origin,
|
| + StorageType type,
|
| + const GetUsageAndQuotaCallback& callback);
|
|
|
| // This method may only be called on the IO thread.
|
| // It may return NULL if the manager has already been deleted.
|
|
|