diff options
| author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 20:14:29 +0000 |
|---|---|---|
| committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 20:14:29 +0000 |
| commit | 84b12db2225b4aeceaf7a7971b43edb48756b3ce (patch) | |
| tree | 5f4f0ae3f2f0e477dcc0756f21bc86ca7a63195f /content | |
| parent | 084a56fc2247f7a0690abb35bb03e3861c56752d (diff) | |
| download | chromium_src-84b12db2225b4aeceaf7a7971b43edb48756b3ce.zip chromium_src-84b12db2225b4aeceaf7a7971b43edb48756b3ce.tar.gz chromium_src-84b12db2225b4aeceaf7a7971b43edb48756b3ce.tar.bz2 | |
--single-process hacks to avoid crashing on shutdown
BUG=92940
Review URL: http://codereview.chromium.org/7677038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/in_process_webkit/indexed_db_context.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/browser/in_process_webkit/indexed_db_context.cc b/content/browser/in_process_webkit/indexed_db_context.cc index 4b9a5d5..0c9c8ff 100644 --- a/content/browser/in_process_webkit/indexed_db_context.cc +++ b/content/browser/in_process_webkit/indexed_db_context.cc @@ -4,6 +4,7 @@ #include "content/browser/in_process_webkit/indexed_db_context.h" +#include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" #include "base/message_loop_proxy.h" @@ -13,6 +14,7 @@ #include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/indexed_db_quota_client.h" #include "content/browser/in_process_webkit/webkit_context.h" +#include "content/common/content_switches.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabase.h" @@ -103,7 +105,8 @@ IndexedDBContext::IndexedDBContext( special_storage_policy_(special_storage_policy), quota_manager_proxy_(quota_manager_proxy) { data_path_ = webkit_context->data_path().Append(kIndexedDBDirectory); - if (quota_manager_proxy) { + if (quota_manager_proxy && + !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) { quota_manager_proxy->RegisterClient( new IndexedDBQuotaClient(webkit_thread_loop, this)); } |