Index: chrome/browser/ui/gtk/gtk_theme_service.cc |
diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc |
index d92d610f160c898c99f27e1c09928eea042713b5..567e48f06caed6bd853ac3cb7d5036fe23445be5 100644 |
--- a/chrome/browser/ui/gtk/gtk_theme_service.cc |
+++ b/chrome/browser/ui/gtk/gtk_theme_service.cc |
@@ -122,7 +122,7 @@ const int kAutocompleteImages[] = { |
}; |
bool IsOverridableImage(int id) { |
- static std::set<int> images; |
+ CR_DEFINE_STATIC_LOCAL(std::set<int>, images, ()); |
if (images.empty()) { |
images.insert(kThemeImages, kThemeImages + arraysize(kThemeImages)); |
images.insert(kAutocompleteImages, |