OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/public/browser/browser_context.h" | 5 #include "content/public/browser/browser_context.h" |
6 | 6 |
7 #include "content/browser/appcache/chrome_appcache_service.h" | 7 #include "content/browser/appcache/chrome_appcache_service.h" |
8 #include "content/browser/dom_storage/dom_storage_context_impl.h" | 8 #include "content/browser/dom_storage/dom_storage_context_impl.h" |
9 #include "content/browser/fileapi/browser_file_system_helper.h" | 9 #include "content/browser/fileapi/browser_file_system_helper.h" |
10 #include "content/browser/in_process_webkit/indexed_db_context_impl.h" | 10 #include "content/browser/in_process_webkit/indexed_db_context_impl.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 | 68 |
69 scoped_refptr<DatabaseTracker> db_tracker = new DatabaseTracker( | 69 scoped_refptr<DatabaseTracker> db_tracker = new DatabaseTracker( |
70 context->GetPath(), context->IsOffTheRecord(), | 70 context->GetPath(), context->IsOffTheRecord(), |
71 context->GetSpecialStoragePolicy(), quota_manager->proxy(), | 71 context->GetSpecialStoragePolicy(), quota_manager->proxy(), |
72 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); | 72 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); |
73 context->SetUserData(kDatabaseTrackerKeyName, | 73 context->SetUserData(kDatabaseTrackerKeyName, |
74 new UserDataAdapter<DatabaseTracker>(db_tracker)); | 74 new UserDataAdapter<DatabaseTracker>(db_tracker)); |
75 | 75 |
76 FilePath path = context->IsOffTheRecord() ? FilePath() : context->GetPath(); | 76 FilePath path = context->IsOffTheRecord() ? FilePath() : context->GetPath(); |
77 scoped_refptr<DOMStorageContextImpl> dom_storage_context = | 77 scoped_refptr<DOMStorageContextImpl> dom_storage_context = |
78 new DOMStorageContextImpl(path, context->GetSpecialStoragePolicy()); | 78 new DOMStorageContextImpl(path, context->GetSpecialStoragePolicy(), |
| 79 context->ShouldSaveSessionStorageOnDisk()); |
79 context->SetUserData( | 80 context->SetUserData( |
80 kDOMStorageContextKeyName, | 81 kDOMStorageContextKeyName, |
81 new UserDataAdapter<DOMStorageContextImpl>(dom_storage_context)); | 82 new UserDataAdapter<DOMStorageContextImpl>(dom_storage_context)); |
82 | 83 |
83 scoped_refptr<IndexedDBContext> indexed_db_context = new IndexedDBContextImpl( | 84 scoped_refptr<IndexedDBContext> indexed_db_context = new IndexedDBContextImpl( |
84 path, context->GetSpecialStoragePolicy(), quota_manager->proxy(), | 85 path, context->GetSpecialStoragePolicy(), quota_manager->proxy(), |
85 BrowserThread::GetMessageLoopProxyForThread( | 86 BrowserThread::GetMessageLoopProxyForThread( |
86 BrowserThread::WEBKIT_DEPRECATED)); | 87 BrowserThread::WEBKIT_DEPRECATED)); |
87 context->SetUserData( | 88 context->SetUserData( |
88 kIndexedDBContextKeyName, | 89 kIndexedDBContextKeyName, |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 BrowserThread::FILE, FROM_HERE, | 239 BrowserThread::FILE, FROM_HERE, |
239 base::Bind(&webkit_database::DatabaseTracker::Shutdown, | 240 base::Bind(&webkit_database::DatabaseTracker::Shutdown, |
240 GetDatabaseTracker(this))); | 241 GetDatabaseTracker(this))); |
241 } | 242 } |
242 | 243 |
243 if (GetUserData(kDOMStorageContextKeyName)) | 244 if (GetUserData(kDOMStorageContextKeyName)) |
244 GetDOMStorageContextImpl(this)->Shutdown(); | 245 GetDOMStorageContextImpl(this)->Shutdown(); |
245 } | 246 } |
246 | 247 |
247 } // namespace content | 248 } // namespace content |
OLD | NEW |