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

Unified Diff: chrome/browser/chromeos/status/network_menu_icon.cc

Issue 8609002: CrOs: Remove 16 exit time destructors and 11 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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/chromeos/status/network_menu_icon.cc
diff --git a/chrome/browser/chromeos/status/network_menu_icon.cc b/chrome/browser/chromeos/status/network_menu_icon.cc
index 207a1e5c921ee13cf648df35c97f0682411e2823..43b66fde3023edeb83a3807fc1369e54b1931421 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon.cc
@@ -699,7 +699,7 @@ const SkBitmap NetworkMenuIcon::GenerateBitmapFromComponents(
// We blend connecting icons with a black image to generate a faded icon.
const SkBitmap NetworkMenuIcon::GenerateConnectingBitmap(
const SkBitmap& source) {
- static SkBitmap empty_badge;
+ CR_DEFINE_STATIC_LOCAL(SkBitmap, empty_badge, ());
if (empty_badge.empty()) {
empty_badge.setConfig(SkBitmap::kARGB_8888_Config,
source.width(), source.height(), 0);

Powered by Google App Engine
This is Rietveld 408576698