| 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 683e105d7d4587564208ed0abe0bd487c1195c76..91d3e36049b8b4daf452718baa20927ee6d7c0eb 100644
|
| --- a/content/browser/dom_storage/dom_storage_context_impl.cc
|
| +++ b/content/browser/dom_storage/dom_storage_context_impl.cc
|
| @@ -26,6 +26,7 @@ using webkit_database::DatabaseUtil;
|
| namespace {
|
|
|
| const char kLocalStorageDirectory[] = "Local Storage";
|
| +const char kSessionStorageDirectory[] = "Session Storage";
|
|
|
| // TODO(michaeln): Fix the content layer api, FilePaths and
|
| // string16 origin_ids are just wrong. Then get rid of
|
| @@ -86,7 +87,8 @@ DOMStorageContextImpl::DOMStorageContextImpl(
|
| 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),
|
| special_storage_policy,
|
| new DomStorageWorkerPoolTaskRunner(
|
| worker_pool,
|
| @@ -142,6 +144,16 @@ void DOMStorageContextImpl::DeleteDataModifiedSince(const base::Time& cutoff) {
|
| cutoff));
|
| }
|
|
|
| +void DOMStorageContextImpl::AssociateSessionStorage(
|
| + int64 namespace_id, int64 real_id) {
|
| + DCHECK(context_);
|
| + context_->task_runner()->PostShutdownBlockingTask(
|
| + FROM_HERE,
|
| + DomStorageTaskRunner::PRIMARY_SEQUENCE,
|
| + base::Bind(&DomStorageContext::AssociateSessionStorage, context_,
|
| + namespace_id, real_id));
|
| +}
|
| +
|
| void DOMStorageContextImpl::PurgeMemory() {
|
| DCHECK(context_);
|
| context_->task_runner()->PostShutdownBlockingTask(
|
|
|