diff options
| author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 01:25:04 +0000 |
|---|---|---|
| committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 01:25:04 +0000 |
| commit | 1ea3c791e775d70095461804fb7cc7a19f1576ca (patch) | |
| tree | 35620b05f8d931ee668ed747afc322e9bdd5f715 /content/browser/browser_context.cc | |
| parent | 4a64ea8eb45c6febf847037fa93e725d83eb0235 (diff) | |
| download | chromium_src-1ea3c791e775d70095461804fb7cc7a19f1576ca.zip chromium_src-1ea3c791e775d70095461804fb7cc7a19f1576ca.tar.gz chromium_src-1ea3c791e775d70095461804fb7cc7a19f1576ca.tar.bz2 | |
More DomStorage house cleaning, many files but all mechanical changes.
- delete old in_process_webkit sources (hooray)
- rename the new sources to no longer have the _new suffix
- fix up the includes
- remove the ENABLE_NEW_DOM_STORAGE_BACKEND flag since old stuff is now gone
Review URL: https://chromiumcodereview.appspot.com/10086018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_context.cc')
| -rw-r--r-- | content/browser/browser_context.cc | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc index 7f7b556..aafbee8 100644 --- a/content/browser/browser_context.cc +++ b/content/browser/browser_context.cc @@ -5,8 +5,8 @@ #include "content/public/browser/browser_context.h" #include "content/browser/appcache/chrome_appcache_service.h" +#include "content/browser/dom_storage/dom_storage_context_impl.h" #include "content/browser/fileapi/browser_file_system_helper.h" -#include "content/browser/in_process_webkit/dom_storage_context_impl.h" #include "content/browser/in_process_webkit/indexed_db_context_impl.h" #include "content/browser/resource_context_impl.h" #include "content/public/browser/browser_thread.h" @@ -240,19 +240,8 @@ BrowserContext::~BrowserContext() { GetDatabaseTracker(this))); } -#ifdef ENABLE_NEW_DOM_STORAGE_BACKEND if (GetUserData(kDOMStorageContextKeyName)) GetDOMStorageContextImpl(this)->Shutdown(); -#else - if (GetUserData(kDOMStorageContextKeyName) && - BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) { - DOMStorageContextImpl* dom_storage_context = - (static_cast<UserDataAdapter<DOMStorageContextImpl>*>( - GetUserData(kDOMStorageContextKeyName)))->release(); - BrowserThread::ReleaseSoon( - BrowserThread::WEBKIT_DEPRECATED, FROM_HERE, dom_storage_context); - } -#endif } } // namespace content |