diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 00:48:34 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 00:48:34 +0000 |
| commit | f6ccd6585c0b58af5ea5dc84fca18116f67254cc (patch) | |
| tree | 0fb06a030722979395abe621d92ab52dc590e01c /chrome/browser/themes | |
| parent | 3ef3e75d2cc88f7bc56976d3acd0d8c4824da738 (diff) | |
| download | chromium_src-f6ccd6585c0b58af5ea5dc84fca18116f67254cc.zip chromium_src-f6ccd6585c0b58af5ea5dc84fca18116f67254cc.tar.gz chromium_src-f6ccd6585c0b58af5ea5dc84fca18116f67254cc.tar.bz2 | |
Move themes garbage-collection out of shutdown code.
Moved it to GarbageCollectExtensions(). This avoids some problems with
shutdown ordering causing crashes.
Re-enable themes sync integration tests on OS X (which were crashing).
BUG=63285,62869
TEST=themes sync integration tests
Review URL: http://codereview.chromium.org/4957005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/themes')
| -rw-r--r-- | chrome/browser/themes/browser_theme_provider.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/themes/browser_theme_provider.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/themes/browser_theme_provider.cc b/chrome/browser/themes/browser_theme_provider.cc index c31a341..4d296a5 100644 --- a/chrome/browser/themes/browser_theme_provider.cc +++ b/chrome/browser/themes/browser_theme_provider.cc @@ -196,8 +196,6 @@ BrowserThemeProvider::BrowserThemeProvider() BrowserThemeProvider::~BrowserThemeProvider() { FreePlatformCaches(); - - RemoveUnusedThemes(); } void BrowserThemeProvider::Init(Profile* profile) { diff --git a/chrome/browser/themes/browser_theme_provider.h b/chrome/browser/themes/browser_theme_provider.h index a47f39c..2322b8b 100644 --- a/chrome/browser/themes/browser_theme_provider.h +++ b/chrome/browser/themes/browser_theme_provider.h @@ -205,6 +205,9 @@ class BrowserThemeProvider : public NonThreadSafe, // Returns the set of IDR_* resources that should be tinted. static const std::set<int>& GetTintableToolbarButtons(); + // Remove preference values for themes that are no longer in use. + void RemoveUnusedThemes(); + // Save the images to be written to disk, mapping file path to id. typedef std::map<FilePath, int> ImagesDiskCache; @@ -247,9 +250,6 @@ class BrowserThemeProvider : public NonThreadSafe, // case we don't have a theme pack). void BuildFromExtension(const Extension* extension); - // Remove preference values for themes that are no longer in use. - void RemoveUnusedThemes(); - #if defined(TOOLKIT_USES_GTK) // Loads an image and flips it horizontally if |rtl_enabled| is true. GdkPixbuf* GetPixbufImpl(int id, bool rtl_enabled) const; |