Quota: Add quota::StorageType to the GetOriginsCallback definition.

webkit/database/database_quota_client.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_DATABASE_DATABASE_QUOTA_CLIENT_H_
 #define WEBKIT_DATABASE_DATABASE_QUOTA_CLIENT_H_
 
 #include <set>
 #include <string>
 
@@ skipping 38 matching lines @@
   class GetOriginsTaskBase;
   class GetAllOriginsTask;
   class GetOriginsForHostTask;
   class DeleteOriginTask;
 
   typedef quota::CallbackQueueMap1
       <GetUsageCallback*,
        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 DidGetAllOrigins(const std::set<GURL>& origins, quota::StorageType type);
   void DidGetOriginsForHost(
-      const std::string& host, const std::set<GURL>& origins);
+      const std::string& host, const std::set<GURL>& origins,
+      quota::StorageType type);

[kinuko, 2011/07/29 11:12:36]

nit: indent
maybe we should put all the params in different lines

[Mike West, 2011/07/29 12:25:42]

Done.

 
   scoped_refptr<base::MessageLoopProxy> db_tracker_thread_;
   scoped_refptr<DatabaseTracker> db_tracker_;  // only used on its thread
   UsageForOriginCallbackMap usage_for_origin_callbacks_;
   OriginsForTypeCallbackQueue origins_for_type_callbacks_;
   OriginsForHostCallbackMap origins_for_host_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(DatabaseQuotaClient);
 };
 
 }  // namespace webkit_database
 
 #endif  // WEBKIT_DATABASE_DATABASE_QUOTA_CLIENT_H_