diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 05:32:19 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 05:32:19 +0000 |
| commit | 0b88baec73430cb25a4d6181b47c221f99fe5d0f (patch) | |
| tree | c5a449884897b3b1f98eb9e66511d86c929700b5 /chrome | |
| parent | 31d9a1aedd6b5ee288face8603e6ab91d334c5e3 (diff) | |
| download | chromium_src-0b88baec73430cb25a4d6181b47c221f99fe5d0f.zip chromium_src-0b88baec73430cb25a4d6181b47c221f99fe5d0f.tar.gz chromium_src-0b88baec73430cb25a4d6181b47c221f99fe5d0f.tar.bz2 | |
Adds a variable indicating whether resources should be deleted on
shutdown. Normally it's true, but I'm going to set it to false for in
process ui tests. I can't delete the ResourceBundle for these tests as
many classes cache SkBitmaps from the resource bundle in statics.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/19609
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_shutdown.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/browser_shutdown.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index b671218..ba80772 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -38,6 +38,8 @@ ShutdownType shutdown_type_ = NOT_VALID; int shutdown_num_processes_; int shutdown_num_processes_slow_; +bool delete_resources_on_shutdown = true; + const wchar_t* const kShutdownMsFile = L"chrome_shutdown_ms.txt"; void RegisterPrefs(PrefService* local_state) { @@ -131,7 +133,8 @@ void Shutdown() { // Uninstall Jank-O-Meter here after the IO thread is no longer running. UninstallJankometer(); - ResourceBundle::CleanupSharedInstance(); + if (delete_resources_on_shutdown) + ResourceBundle::CleanupSharedInstance(); if (!Upgrade::IsBrowserAlreadyRunning()) { Upgrade::SwapNewChromeExeIfPresent(); diff --git a/chrome/browser/browser_shutdown.h b/chrome/browser/browser_shutdown.h index 61c1287..0b7aa51 100644 --- a/chrome/browser/browser_shutdown.h +++ b/chrome/browser/browser_shutdown.h @@ -9,6 +9,10 @@ class PrefService; namespace browser_shutdown { +// Should Shutdown() delete the ResourceBundle? This is normally true, but set +// to false for in process unit tests. +extern bool delete_resources_on_shutdown; + enum ShutdownType { // an uninitialized value NOT_VALID = 0, |