Chromium Code Reviews| Index: content/browser/dom_storage/dom_storage_context_impl.cc |
| diff --git a/content/browser/dom_storage/dom_storage_context_impl.cc b/content/browser/dom_storage/dom_storage_context_impl.cc |
| index d525462ee2ab28b0ab892fc5520086d7e1ffcada..3c631ef2ded093f067770b181ebc250ed5408599 100644 |
| --- a/content/browser/dom_storage/dom_storage_context_impl.cc |
| +++ b/content/browser/dom_storage/dom_storage_context_impl.cc |
| @@ -24,6 +24,7 @@ using dom_storage::DomStorageWorkerPoolTaskRunner; |
| namespace { |
| const char kLocalStorageDirectory[] = "Local Storage"; |
| +const char kSessionStorageDirectory[] = "Session Storage"; |
| void InvokeUsageInfoCallbackHelper( |
| const DOMStorageContext::GetUsageInfoCallback& callback, |
| @@ -50,12 +51,11 @@ DOMStorageContextImpl::DOMStorageContextImpl( |
| const FilePath& data_path, |
| quota::SpecialStoragePolicy* special_storage_policy) { |
| base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool(); |
| - // TODO(marja): Pass a nonempty session storage directory when session storage |
| - // is backed on disk. |
| context_ = new dom_storage::DomStorageContext( |
| data_path.empty() ? |
| data_path : data_path.AppendASCII(kLocalStorageDirectory), |
| - FilePath(), // Empty session storage directory. |
| + data_path.empty() ? |
| + data_path : data_path.AppendASCII(kSessionStorageDirectory), |
|
jam
2012/07/12 18:27:38
nit: indent
marja
2012/07/13 09:05:17
Done.
|
| special_storage_policy, |
| new DomStorageWorkerPoolTaskRunner( |
| worker_pool, |
| @@ -85,6 +85,11 @@ void DOMStorageContextImpl::DeleteOrigin(const GURL& origin) { |
| base::Bind(&DomStorageContext::DeleteOrigin, context_, origin)); |
| } |
| +void DOMStorageContextImpl::SetSaveSessionStorageOnDisk() { |
| + DCHECK(context_); |
| + context_->SetSaveSessionStorageOnDisk(); |
| +} |
| + |
| scoped_refptr<content::SessionStorageNamespace> |
| DOMStorageContextImpl::RecreateSessionStorage( |
| const std::string& persistent_id) { |
| @@ -92,6 +97,15 @@ DOMStorageContextImpl::RecreateSessionStorage( |
| new SessionStorageNamespaceImpl(this, persistent_id)); |
| } |
| +void DOMStorageContextImpl::StartScavengingUnusedSessionStorage() { |
| + DCHECK(context_); |
| + context_->task_runner()->PostShutdownBlockingTask( |
| + FROM_HERE, |
| + DomStorageTaskRunner::PRIMARY_SEQUENCE, |
| + base::Bind(&DomStorageContext::StartScavengingUnusedSessionStorage, |
| + context_)); |
| +} |
| + |
| void DOMStorageContextImpl::PurgeMemory() { |
| DCHECK(context_); |
| context_->task_runner()->PostShutdownBlockingTask( |