Index: ui/native_theme/native_theme_win.cc |
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc |
index a09be6c30e74669915ba344663dfa945d381e572..5978714b14463a16ce780e996f3e8b868018ec66 100644 |
--- a/ui/native_theme/native_theme_win.cc |
+++ b/ui/native_theme/native_theme_win.cc |
@@ -27,7 +27,6 @@ |
#include "ui/gfx/gdi_util.h" |
#include "ui/gfx/rect.h" |
#include "ui/gfx/rect_conversions.h" |
-#include "ui/gfx/sys_color_change_listener.h" |
#include "ui/gfx/win/dpi.h" |
#include "ui/native_theme/common_theme.h" |
@@ -212,16 +211,6 @@ bool NativeThemeWin::IsClassicTheme(ThemeName name) const { |
return !GetThemeHandle(name); |
} |
-// TODO(sky): seems like we should default to NativeThemeWin, but that currently |
-// breaks a couple of tests (FocusTraversalTest.NormalTraversal in |
-// views_unittests). |
-#if !defined(USE_AURA) |
-// static |
-NativeTheme* NativeTheme::instance() { |
- return NativeThemeWin::instance(); |
-} |
-#endif |
- |
// static |
NativeThemeWin* NativeThemeWin::instance() { |
CR_DEFINE_STATIC_LOCAL(NativeThemeWin, s_native_theme, ()); |
@@ -399,6 +388,7 @@ NativeThemeWin::~NativeThemeWin() { |
void NativeThemeWin::OnSysColorChange() { |
UpdateSystemColors(); |
is_using_high_contrast_valid_ = false; |
+ NotifyObservers(); |
} |
void NativeThemeWin::UpdateSystemColors() { |