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

Unified Diff: chrome/browser/ui/app_list/arc/arc_app_icon.cc

Issue 2733283002: Require explicit selection of traits for LazyInstance (Closed)
Patch Set: l10n again Created 3 years, 9 months 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/ui/app_list/arc/arc_app_icon.cc
diff --git a/chrome/browser/ui/app_list/arc/arc_app_icon.cc b/chrome/browser/ui/app_list/arc/arc_app_icon.cc
index 7a9614313d4521d8b902e219861ad751ca2e2eef..f888755d4ab4f6cd8d233f51729d7ab10447a2b6 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_icon.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_icon.cc
@@ -107,14 +107,15 @@ class ArcAppIcon::Source : public gfx::ImageSkiaSource {
// A map from a pair of a resource ID and size in DIP to an image. This
// is a cache to avoid resizing IDR icons in GetImageForScale every time.
- static base::LazyInstance<std::map<std::pair<int, int>, gfx::ImageSkia>>
- default_icons_cache_;
+ static base::LazyInstance<std::map<std::pair<int, int>, gfx::ImageSkia>>::
+ DestructorAtExit default_icons_cache_;
DISALLOW_COPY_AND_ASSIGN(Source);
};
-base::LazyInstance<std::map<std::pair<int, int>, gfx::ImageSkia>>
- ArcAppIcon::Source::default_icons_cache_ = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<std::map<std::pair<int, int>, gfx::ImageSkia>>::
+ DestructorAtExit ArcAppIcon::Source::default_icons_cache_ =
+ LAZY_INSTANCE_INITIALIZER;
ArcAppIcon::Source::Source(const base::WeakPtr<ArcAppIcon>& host,
int resource_size_in_dip)

Powered by Google App Engine
This is Rietveld 408576698