Index: ui/gfx/native_theme_win.cc |
diff --git a/ui/gfx/native_theme_win.cc b/ui/gfx/native_theme_win.cc |
index 23a5e5012491c4a1b3882eaccdef34c3c72b641b..8b4ea1d71442c38aaafe0566d4bbf71eafbe13ff 100644 |
--- a/ui/gfx/native_theme_win.cc |
+++ b/ui/gfx/native_theme_win.cc |
@@ -9,6 +9,7 @@ |
#include <vsstyle.h> |
#include <vssym32.h> |
+#include "base/lazy_instance.h" |
#include "base/logging.h" |
#include "base/memory/scoped_handle.h" |
#include "base/memory/scoped_ptr.h" |
@@ -62,11 +63,12 @@ const NativeTheme* NativeTheme::instance() { |
return NativeThemeWin::instance(); |
} |
+static base::LazyInstance<NativeThemeWin> g_native_theme( |
+ base::LINKER_INITIALIZED); |
+ |
// static |
const NativeThemeWin* NativeThemeWin::instance() { |
- // The global NativeThemeWin instance. |
- static const NativeThemeWin s_native_theme; |
- return &s_native_theme; |
+ return g_native_theme.Pointer(); |
} |
NativeThemeWin::NativeThemeWin() |