Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: webkit/fileapi/file_system_quota_client.cc

Issue 7533013: Quota: Add quota::StorageType to the GetOriginsCallback definition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebasing onto today's ToT. Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/fileapi/file_system_quota_client.h ('k') | webkit/fileapi/file_system_quota_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/file_system_quota_client.cc
diff --git a/webkit/fileapi/file_system_quota_client.cc b/webkit/fileapi/file_system_quota_client.cc
index f3fec60d982b26b21cac95052476076b0b7ff326..3f8e2e5f2dfb71f19027961df47eca679ebe72b6 100644
--- a/webkit/fileapi/file_system_quota_client.cc
+++ b/webkit/fileapi/file_system_quota_client.cc
@@ -220,7 +220,7 @@ void FileSystemQuotaClient::GetOriginsForType(
scoped_ptr<GetOriginsCallback> callback(callback_ptr);
if (is_incognito_) {
// We don't support FileSystem in incognito mode yet.
- callback->Run(origins);
+ callback->Run(origins, storage_type);
return;
}
@@ -242,7 +242,7 @@ void FileSystemQuotaClient::GetOriginsForHost(
scoped_ptr<GetOriginsCallback> callback(callback_ptr);
if (is_incognito_) {
// We don't support FileSystem in incognito mode yet.
- callback->Run(origins);
+ callback->Run(origins, storage_type);
return;
}
@@ -280,13 +280,15 @@ void FileSystemQuotaClient::DidGetOriginUsage(
void FileSystemQuotaClient::DidGetOriginsForType(
FileSystemType type, const std::set<GURL>& origins) {
DCHECK(pending_origins_for_type_callbacks_.HasCallbacks(type));
- pending_origins_for_type_callbacks_.Run(type, origins);
+ pending_origins_for_type_callbacks_.Run(type, origins,
+ FileSystemTypeToQuotaStorageType(type));
}
void FileSystemQuotaClient::DidGetOriginsForHost(
const TypeAndHostOrOrigin& type_and_host, const std::set<GURL>& origins) {
DCHECK(pending_origins_for_host_callbacks_.HasCallbacks(type_and_host));
- pending_origins_for_host_callbacks_.Run(type_and_host, origins);
+ pending_origins_for_host_callbacks_.Run(type_and_host, origins,
+ FileSystemTypeToQuotaStorageType(type_and_host.first));
}
} // namespace fileapi
« no previous file with comments | « webkit/fileapi/file_system_quota_client.h ('k') | webkit/fileapi/file_system_quota_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698