Index: chrome/browser/ui/webui/quota_internals_proxy.cc |
diff --git a/chrome/browser/ui/webui/quota_internals_proxy.cc b/chrome/browser/ui/webui/quota_internals_proxy.cc |
index f2a31f13fba5ef630eca8e010388d76406fd1d4e..fca3425211cecabcaf2cfa5172198627497d403c 100644 |
--- a/chrome/browser/ui/webui/quota_internals_proxy.cc |
+++ b/chrome/browser/ui/webui/quota_internals_proxy.cc |
@@ -7,6 +7,7 @@ |
#include <set> |
#include <string> |
+#include "base/bind.h" |
#include "chrome/browser/ui/webui/quota_internals_handler.h" |
#include "chrome/browser/ui/webui/quota_internals_types.h" |
#include "net/base/net_util.h" |
@@ -15,7 +16,7 @@ namespace quota_internals { |
QuotaInternalsProxy::QuotaInternalsProxy(QuotaInternalsHandler* handler) |
: handler_(handler), |
- callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { |
+ weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { |
} |
QuotaInternalsProxy::~QuotaInternalsProxy() {} |
@@ -56,30 +57,30 @@ void QuotaInternalsProxy::RequestInfo( |
quota_manager_ = quota_manager; |
quota_manager_->GetAvailableSpace( |
- callback_factory_.NewCallback( |
- &QuotaInternalsProxy::DidGetAvailableSpace)); |
+ base::Bind(&QuotaInternalsProxy::DidGetAvailableSpace, |
+ weak_factory_.GetWeakPtr())); |
quota_manager_->GetTemporaryGlobalQuota( |
- callback_factory_.NewCallback( |
- &QuotaInternalsProxy::DidGetGlobalQuota)); |
+ base::Bind(&QuotaInternalsProxy::DidGetGlobalQuota, |
+ weak_factory_.GetWeakPtr())); |
quota_manager_->GetGlobalUsage( |
quota::kStorageTypeTemporary, |
- callback_factory_.NewCallback( |
- &QuotaInternalsProxy::DidGetGlobalUsage)); |
+ base::Bind(&QuotaInternalsProxy::DidGetGlobalUsage, |
+ weak_factory_.GetWeakPtr())); |
quota_manager_->GetGlobalUsage( |
quota::kStorageTypePersistent, |
- callback_factory_.NewCallback( |
- &QuotaInternalsProxy::DidGetGlobalUsage)); |
+ base::Bind(&QuotaInternalsProxy::DidGetGlobalUsage, |
+ weak_factory_.GetWeakPtr())); |
quota_manager_->DumpQuotaTable( |
- callback_factory_.NewCallback( |
- &QuotaInternalsProxy::DidDumpQuotaTable)); |
+ base::Bind(&QuotaInternalsProxy::DidDumpQuotaTable, |
+ weak_factory_.GetWeakPtr())); |
quota_manager_->DumpOriginInfoTable( |
- callback_factory_.NewCallback( |
- &QuotaInternalsProxy::DidDumpOriginInfoTable)); |
+ base::Bind(&QuotaInternalsProxy::DidDumpOriginInfoTable, |
+ weak_factory_.GetWeakPtr())); |
std::map<std::string, std::string> stats; |
quota_manager_->GetStatistics(&stats); |
@@ -181,8 +182,8 @@ void QuotaInternalsProxy::GetHostUsage(const std::string& host, |
DCHECK(quota_manager_); |
quota_manager_->GetHostUsage( |
host, type, |
- callback_factory_.NewCallback( |
- &QuotaInternalsProxy::DidGetHostUsage)); |
+ base::Bind(&QuotaInternalsProxy::DidGetHostUsage, |
+ weak_factory_.GetWeakPtr())); |
} |
void QuotaInternalsProxy::RequestPerOriginInfo(quota::StorageType type) { |