diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 06:06:15 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 06:06:15 +0000 |
| commit | e4de6b5d0a654164e312f6213d81c41df7ca5eed (patch) | |
| tree | 04e72943e8b22305d6aeee85c288987ebd3dce33 /chrome/browser/themes | |
| parent | 383a0ca55d444ac67c9be491f74e591b7c1ccea7 (diff) | |
| download | chromium_src-e4de6b5d0a654164e312f6213d81c41df7ca5eed.zip chromium_src-e4de6b5d0a654164e312f6213d81c41df7ca5eed.tar.gz chromium_src-e4de6b5d0a654164e312f6213d81c41df7ca5eed.tar.bz2 | |
chrome: Remove 11 exit time destructors and 4 static initializers.
BUG=101600,94925
TEST=none
TBR=erg,willchan
Review URL: http://codereview.chromium.org/8590003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/themes')
| -rw-r--r-- | chrome/browser/themes/theme_service.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index 049bd27..8b96356 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -153,7 +153,7 @@ const int kThemeableImages[] = { }; bool HasThemeableImage(int themeable_image_id) { - static std::set<int> themeable_images; + CR_DEFINE_STATIC_LOCAL(std::set<int>, themeable_images, ()); if (themeable_images.empty()) { themeable_images.insert( kThemeableImages, kThemeableImages + arraysize(kThemeableImages)); @@ -537,7 +537,7 @@ bool ThemeService::GetDefaultDisplayProperty(int id, int* result) { // static const std::set<int>& ThemeService::GetTintableToolbarButtons() { - static std::set<int> button_set; + CR_DEFINE_STATIC_LOCAL(std::set<int>, button_set, ()); if (button_set.empty()) { button_set = std::set<int>( kToolbarButtonIDs, |