Merged HostQuotaCallback into QuotaCallback

chrome/browser/ui/webui/quota_internals_proxy.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/quota_internals_proxy.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 20 matching lines @@
     return;
   }
 
   quota_manager_ = quota_manager;
   quota_manager_->GetAvailableSpace(
       base::Bind(&QuotaInternalsProxy::DidGetAvailableSpace,
                  weak_factory_.GetWeakPtr()));
 
   quota_manager_->GetTemporaryGlobalQuota(
       base::Bind(&QuotaInternalsProxy::DidGetGlobalQuota,
-                 weak_factory_.GetWeakPtr()));
+                 weak_factory_.GetWeakPtr(), quota::kStorageTypeTemporary));
 
   quota_manager_->GetGlobalUsage(
       quota::kStorageTypeTemporary,
       base::Bind(&QuotaInternalsProxy::DidGetGlobalUsage,
                  weak_factory_.GetWeakPtr()));
 
   quota_manager_->GetGlobalUsage(
       quota::kStorageTypePersistent,
       base::Bind(&QuotaInternalsProxy::DidGetGlobalUsage,
                  weak_factory_.GetWeakPtr()));
@@ skipping 34 matching lines @@
 RELAY_TO_HANDLER(ReportStatistics, const Statistics&)
 
 #undef RELAY_TO_HANDLER
 
 void QuotaInternalsProxy::DidGetAvailableSpace(quota::QuotaStatusCode status,
                                                int64 space) {
   if (status == quota::kQuotaStatusOk)
     ReportAvailableSpace(space);
 }
 
-void QuotaInternalsProxy::DidGetGlobalQuota(quota::QuotaStatusCode status,
-                                            quota::StorageType type,
+void QuotaInternalsProxy::DidGetGlobalQuota(quota::StorageType type,
+                                            quota::QuotaStatusCode status,
                                             int64 quota) {
   if (status == quota::kQuotaStatusOk) {
     GlobalStorageInfo info(type);
     info.set_quota(quota);
     ReportGlobalInfo(info);
   }
 }
 
 void QuotaInternalsProxy::DidGetGlobalUsage(quota::StorageType type,
                                             int64 usage,
@@ skipping 101 matching lines @@
 void QuotaInternalsProxy::GetHostUsage(const std::string& host,
                                        quota::StorageType type) {
   DCHECK(quota_manager_);
   quota_manager_->GetHostUsage(
       host, type,
       base::Bind(&QuotaInternalsProxy::DidGetHostUsage,
                  weak_factory_.GetWeakPtr(), host, type));
 }
 
 }  // namespace quota_internals