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

Unified Diff: content/browser/service_worker/service_worker_storage.h

Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos build Created 6 years, 4 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
Index: content/browser/service_worker/service_worker_storage.h
diff --git a/content/browser/service_worker/service_worker_storage.h b/content/browser/service_worker/service_worker_storage.h
index a9dc89ee1571abf0b50910d88e1a95f6461adcd9..1423f32ae23325b1951cf8a9e371844ba33eff23 100644
--- a/content/browser/service_worker/service_worker_storage.h
+++ b/content/browser/service_worker/service_worker_storage.h
@@ -26,7 +26,7 @@ class SequencedTaskRunner;
class SingleThreadTaskRunner;
}
-namespace quota {
+namespace storage {
class QuotaManagerProxy;
}
@@ -63,7 +63,7 @@ class CONTENT_EXPORT ServiceWorkerStorage
base::WeakPtr<ServiceWorkerContextCore> context,
const scoped_refptr<base::SequencedTaskRunner>& database_task_runner,
const scoped_refptr<base::SingleThreadTaskRunner>& disk_cache_thread,
- quota::QuotaManagerProxy* quota_manager_proxy);
+ storage::QuotaManagerProxy* quota_manager_proxy);
// Used for DeleteAndStartOver. Creates new storage based on |old_storage|.
static scoped_ptr<ServiceWorkerStorage> Create(
@@ -224,7 +224,7 @@ class CONTENT_EXPORT ServiceWorkerStorage
base::WeakPtr<ServiceWorkerContextCore> context,
const scoped_refptr<base::SequencedTaskRunner>& database_task_runner,
const scoped_refptr<base::SingleThreadTaskRunner>& disk_cache_thread,
- quota::QuotaManagerProxy* quota_manager_proxy);
+ storage::QuotaManagerProxy* quota_manager_proxy);
base::FilePath GetDatabasePath();
base::FilePath GetDiskCachePath();
@@ -377,7 +377,7 @@ class CONTENT_EXPORT ServiceWorkerStorage
scoped_refptr<base::SequencedTaskRunner> database_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> disk_cache_thread_;
- scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
+ scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy_;
scoped_ptr<ServiceWorkerDiskCache> disk_cache_;
std::deque<int64> purgeable_resource_ids_;
bool is_purge_pending_;

Powered by Google App Engine
This is Rietveld 408576698