Update Windows UI on system color changes.

ui/native_theme/native_theme_win.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_NATIVE_THEME_NATIVE_THEME_WIN_H_
 #define UI_NATIVE_THEME_NATIVE_THEME_WIN_H_
 
 // A wrapper class for working with custom XP/Vista themes provided in
 // uxtheme.dll.  This is a singleton class that can be grabbed using
 // NativeThemeWin::instance().
 // For more information on visual style parts and states, see:
 // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/commctls/userex/topics/partsandstates.asp
 
 #include <map>
 
 #include <windows.h>
 #include <uxtheme.h>
 
 #include "base/basictypes.h"
 #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;
 
 namespace ui {
 
 // Windows implementation of native theme class.
 //
 // At the moment, this class in in transition from an older API that consists
 // 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,
     LIST,
     MENU,
     MENULIST,
     SCROLLBAR,
     STATUS,
     TAB,
     TEXTFIELD,
@@ skipping 59 matching lines @@
   virtual gfx::Size GetPartSize(Part part,
                                 State state,
                                 const ExtraParams& extra) const OVERRIDE;
   virtual void Paint(SkCanvas* canvas,
                      Part part,
                      State state,
                      const gfx::Rect& rect,
                      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();
 
   // Paint directly to canvas' HDC.
   void PaintDirect(SkCanvas* canvas,
                    Part part,
                    State state,
                    const gfx::Rect& rect,
                    const ExtraParams& extra) const;
 
@@ skipping 214 matching lines @@
   SetThemeAppPropertiesPtr set_theme_properties_;
   IsThemeActivePtr is_theme_active_;
   GetThemeIntPtr get_theme_int_;
 
   // Handle to uxtheme.dll.
   HMODULE theme_dll_;
 
   // 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?
   mutable bool is_using_high_contrast_;
 
   // Is |is_using_high_contrast_| valid?
   mutable bool is_using_high_contrast_valid_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeThemeWin);
 };
 
 }  // namespace ui
 
 #endif  // UI_NATIVE_THEME_NATIVE_THEME_WIN_H_