Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4369)

Unified Diff: chrome/browser/themes/theme_service.cc

Issue 8590003: chrome: Remove 11 exit time destructors and 4 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no gyp changes :-( Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/themes/theme_service.cc
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index 049bd27627c7a6757d5ca60d581c315ab7432bd0..8b96356fd836d758a2fd3093acfcf3814c9717cc 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,

Powered by Google App Engine
This is Rietveld 408576698