| Index: webkit/fileapi/file_system_quota_client.h
|
| diff --git a/webkit/fileapi/file_system_quota_client.h b/webkit/fileapi/file_system_quota_client.h
|
| index 40456286600d5c8a0b493d539a68c1995405e468..35c0b79e911d7f71be3958cbf668901dd11edc09 100644
|
| --- a/webkit/fileapi/file_system_quota_client.h
|
| +++ b/webkit/fileapi/file_system_quota_client.h
|
| @@ -43,15 +43,18 @@ class FileSystemQuotaClient : public quota::QuotaClient,
|
| virtual void OnQuotaManagerDestroyed() OVERRIDE;
|
| virtual void GetOriginUsage(const GURL& origin_url,
|
| quota::StorageType type,
|
| - GetUsageCallback* callback) OVERRIDE;
|
| - virtual void GetOriginsForType(quota::StorageType type,
|
| - GetOriginsCallback* callback) OVERRIDE;
|
| - virtual void GetOriginsForHost(quota::StorageType type,
|
| - const std::string& host,
|
| - GetOriginsCallback* callback) OVERRIDE;
|
| - virtual void DeleteOriginData(const GURL& origin,
|
| - quota::StorageType type,
|
| - DeletionCallback* callback) OVERRIDE;
|
| + 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;
|
|
|
| private:
|
| class GetOriginUsageTask;
|
| @@ -61,16 +64,16 @@ class FileSystemQuotaClient : public quota::QuotaClient,
|
| class DeleteOriginTask;
|
|
|
| typedef std::pair<fileapi::FileSystemType, std::string> TypeAndHostOrOrigin;
|
| - typedef quota::CallbackQueueMap1<GetUsageCallback*,
|
| + typedef quota::CallbackQueueMap1<GetUsageCallback,
|
| TypeAndHostOrOrigin,
|
| int64
|
| > UsageCallbackMap;
|
| - typedef quota::CallbackQueueMap2<GetOriginsCallback*,
|
| + typedef quota::CallbackQueueMap2<GetOriginsCallback,
|
| fileapi::FileSystemType,
|
| const std::set<GURL>&,
|
| quota::StorageType
|
| > OriginsForTypeCallbackMap;
|
| - typedef quota::CallbackQueueMap2<GetOriginsCallback*,
|
| + typedef quota::CallbackQueueMap2<GetOriginsCallback,
|
| TypeAndHostOrOrigin,
|
| const std::set<GURL>&,
|
| quota::StorageType
|
|
|