Index: ui/native_theme/native_theme_win.h |
diff --git a/ui/native_theme/native_theme_win.h b/ui/native_theme/native_theme_win.h |
index 408818fb657cd50a8bf7268d7bd7c23b37fc66fa..d2ee5503db2b68370fb11c06e53c92e7b68e2658 100644 |
--- a/ui/native_theme/native_theme_win.h |
+++ b/ui/native_theme/native_theme_win.h |
@@ -20,7 +20,6 @@ |
#include "base/compiler_specific.h" |
#include "third_party/skia/include/core/SkColor.h" |
#include "ui/gfx/size.h" |
-#include "ui/gfx/sys_color_change_listener.h" |
#include "ui/native_theme/native_theme.h" |
class SkCanvas; |
@@ -33,8 +32,7 @@ namespace ui { |
// of several PaintXXX methods to an API, inherited from the NativeTheme base |
// class, that consists of a single Paint() method with a argument to indicate |
// what kind of part to paint. |
-class NATIVE_THEME_EXPORT NativeThemeWin : public NativeTheme, |
- public gfx::SysColorChangeListener { |
+class NATIVE_THEME_EXPORT NativeThemeWin : public NativeTheme { |
public: |
enum ThemeName { |
BUTTON, |
@@ -114,13 +112,14 @@ class NATIVE_THEME_EXPORT NativeThemeWin : public NativeTheme, |
const ExtraParams& extra) const OVERRIDE; |
virtual SkColor GetSystemColor(ColorId color_id) const OVERRIDE; |
+ protected: |
+ // gfx::SysColorChangeListener implementation: |
+ virtual void OnSysColorChange() OVERRIDE; |
+ |
private: |
NativeThemeWin(); |
~NativeThemeWin(); |
- // gfx::SysColorChangeListener implementation: |
- virtual void OnSysColorChange() OVERRIDE; |
- |
// Update the locally cached set of system colors. |
void UpdateSystemColors(); |
@@ -355,8 +354,7 @@ class NATIVE_THEME_EXPORT NativeThemeWin : public NativeTheme, |
// A cache of open theme handles. |
mutable HANDLE theme_handles_[LAST]; |
- // The system color change listener and the updated cache of system colors. |
- gfx::ScopedSysColorChangeListener color_change_listener_; |
+ // The cache of system colors. |
mutable std::map<int, SkColor> system_colors_; |
// Is a high contrast theme active? |