| Index: webkit/database/database_quota_client.h
|
| diff --git a/webkit/database/database_quota_client.h b/webkit/database/database_quota_client.h
|
| index acc839e8b24744daf0ca7d474a86fd1307dc5657..fb37ff6150a6034788b8f6f211864fc0e51ff70e 100644
|
| --- a/webkit/database/database_quota_client.h
|
| +++ b/webkit/database/database_quota_client.h
|
| @@ -56,20 +56,23 @@ class DatabaseQuotaClient : public quota::QuotaClient,
|
| GURL, // origin
|
| int64
|
| > UsageForOriginCallbackMap;
|
| - typedef quota::CallbackQueue1
|
| + typedef quota::CallbackQueue2
|
| <GetOriginsCallback*,
|
| - const std::set<GURL>&
|
| + const std::set<GURL>&,
|
| + quota::StorageType
|
| > OriginsForTypeCallbackQueue;
|
| - typedef quota::CallbackQueueMap1
|
| + typedef quota::CallbackQueueMap2
|
| <GetOriginsCallback*,
|
| std::string, // host
|
| - const std::set<GURL>&
|
| + const std::set<GURL>&,
|
| + quota::StorageType
|
| > OriginsForHostCallbackMap;
|
|
|
| void DidGetOriginUsage(const GURL& origin_url, int64 usage);
|
| - void DidGetAllOrigins(const std::set<GURL>& origins);
|
| - void DidGetOriginsForHost(
|
| - const std::string& host, const std::set<GURL>& origins);
|
| + void DidGetAllOrigins(const std::set<GURL>& origins, quota::StorageType type);
|
| + void DidGetOriginsForHost(const std::string& host,
|
| + const std::set<GURL>& origins,
|
| + quota::StorageType type);
|
|
|
| scoped_refptr<base::MessageLoopProxy> db_tracker_thread_;
|
| scoped_refptr<DatabaseTracker> db_tracker_; // only used on its thread
|
|
|