Quota: Return a pair of usage and granted_quota on requesting quota.

content/child/quota_dispatcher.cc

 // 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.
 
 #include "content/child/quota_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "content/child/child_thread.h"
@@ skipping 24 matching lines @@
 class WebStorageQuotaDispatcherCallback : public QuotaDispatcher::Callback {
  public:
   WebStorageQuotaDispatcherCallback(blink::WebStorageQuotaCallbacks* callback)
       : callbacks_(callback) {
     DCHECK(callbacks_);
   }
   virtual ~WebStorageQuotaDispatcherCallback() {}
   virtual void DidQueryStorageUsageAndQuota(int64 usage, int64 quota) OVERRIDE {
     callbacks_->didQueryStorageUsageAndQuota(usage, quota);
   }
-  virtual void DidGrantStorageQuota(int64 granted_quota) OVERRIDE {
+  virtual void DidGrantStorageQuota(int64 usage, int64 granted_quota) OVERRIDE {
     callbacks_->didGrantStorageQuota(granted_quota);
   }
   virtual void DidFail(quota::QuotaStatusCode error) OVERRIDE {
     callbacks_->didFail(static_cast<WebStorageQuotaError>(error));
   }
 
  private:
   // Not owned (self-destructed).
   blink::WebStorageQuotaCallbacks* callbacks_;
 };
@@ skipping 78 matching lines @@
 
 // static
 QuotaDispatcher::Callback*
 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(
     blink::WebStorageQuotaCallbacks* callbacks) {
   return new WebStorageQuotaDispatcherCallback(callbacks);
 }
 
 void QuotaDispatcher::DidGrantStorageQuota(
     int request_id,
+    int64 current_usage,
     int64 granted_quota) {
   Callback* callback = pending_quota_callbacks_.Lookup(request_id);
   DCHECK(callback);
-  callback->DidGrantStorageQuota(granted_quota);
+  callback->DidGrantStorageQuota(current_usage, granted_quota);
   pending_quota_callbacks_.Remove(request_id);
 }
 
 void QuotaDispatcher::DidQueryStorageUsageAndQuota(
     int request_id,
     int64 current_usage,
     int64 current_quota) {
   Callback* callback = pending_quota_callbacks_.Lookup(request_id);
   DCHECK(callback);
   callback->DidQueryStorageUsageAndQuota(current_usage, current_quota);
@@ skipping 13 matching lines @@
                int(quota::kStorageTypeTemporary), mismatching_enums);
 COMPILE_ASSERT(int(blink::WebStorageQuotaTypePersistent) == \
                int(quota::kStorageTypePersistent), mismatching_enums);
 
 COMPILE_ASSERT(int(blink::WebStorageQuotaErrorNotSupported) == \
                int(quota::kQuotaErrorNotSupported), mismatching_enums);
 COMPILE_ASSERT(int(blink::WebStorageQuotaErrorAbort) == \
                int(quota::kQuotaErrorAbort), mismatching_enums);
 
 }  // namespace content