content/browser/service_worker/service_worker_context_core.cc - Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/service_worker/service_worker_context_core.cc

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

« no previous file with comments | « content/browser/service_worker/service_worker_context_core.h ('k') | content/browser/service_worker/service_worker_context_request_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_context_core.cc

diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc

index 57a3d1a1a85558dab4b24bbac18d63904a8c238d..b1d842bd727c7b7adf76d2c40414fa69df34e870 100644

--- a/content/browser/service_worker/service_worker_context_core.cc

+++ b/content/browser/service_worker/service_worker_context_core.cc

@@ -86,7 +86,7 @@ ServiceWorkerContextCore::ServiceWorkerContextCore(

const scoped_refptr<base::SequencedTaskRunner>& cache_task_runner,

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,

ObserverListThreadSafe<ServiceWorkerContextObserver>* observer_list,

ServiceWorkerContextWrapper* wrapper)

: weak_factory_(this),

@@ -338,7 +338,7 @@ void ServiceWorkerContextCore::DeleteAndStartOver(

void ServiceWorkerContextCore::SetBlobParametersForCache(

net::URLRequestContext* request_context,

- base::WeakPtr<webkit_blob::BlobStorageContext> blob_storage_context) {

+ base::WeakPtr<storage::BlobStorageContext> blob_storage_context) {

DCHECK_CURRENTLY_ON(BrowserThread::IO);

cache_manager_->SetBlobParametersForCache(request_context,