Update Windows UI on system color changes.

ui/native_theme/native_theme_win.cc

 // 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.
 
 #include "ui/native_theme/native_theme_win.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_handle.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/scoped_select_object.h"
 #include "base/win/windows_version.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/gfx/color_utils.h"
 #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"
 
 // This was removed from Winvers.h but is still used.
 #if !defined(COLOR_MENUHIGHLIGHT)
 #define COLOR_MENUHIGHLIGHT 29
 #endif
 
 namespace {
 
@@ skipping 164 matching lines @@
   }
 }
 
 bool NativeThemeWin::IsClassicTheme(ThemeName name) const {
   if (!theme_dll_)
     return true;
 
   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, ());
   return &s_native_theme;
 }
 
 gfx::Size NativeThemeWin::GetPartSize(Part part,
                                       State state,
                                       const ExtraParams& extra) const {
   gfx::Size part_size = CommonThemeGetPartSize(part, state, extra);
@@ skipping 102 matching lines @@
         break;
     }
   }
 
   if (needs_paint_indirect)
     PaintIndirect(canvas, part, state, rect, extra);
   else
     PaintDirect(canvas, part, state, rect, extra);
 }
 
+void NativeThemeWin::OnSysColorChange() {
+  UpdateSystemColors();
+  is_using_high_contrast_valid_ = false;
+  NativeTheme::OnSysColorChange();
+}
+
 NativeThemeWin::NativeThemeWin()
     : theme_dll_(LoadLibrary(L"uxtheme.dll")),
       draw_theme_(NULL),
       draw_theme_ex_(NULL),
       get_theme_color_(NULL),
       get_theme_content_rect_(NULL),
       get_theme_part_size_(NULL),
       open_theme_(NULL),
       close_theme_(NULL),
       set_theme_properties_(NULL),
       is_theme_active_(NULL),
       get_theme_int_(NULL),
-      color_change_listener_(this),
       is_using_high_contrast_(false),
       is_using_high_contrast_valid_(false) {
   if (theme_dll_) {
     draw_theme_ = reinterpret_cast<DrawThemeBackgroundPtr>(
         GetProcAddress(theme_dll_, "DrawThemeBackground"));
     draw_theme_ex_ = reinterpret_cast<DrawThemeBackgroundExPtr>(
         GetProcAddress(theme_dll_, "DrawThemeBackgroundEx"));
     get_theme_color_ = reinterpret_cast<GetThemeColorPtr>(
         GetProcAddress(theme_dll_, "GetThemeColor"));
     get_theme_content_rect_ = reinterpret_cast<GetThemeContentRectPtr>(
@@ skipping 19 matching lines @@
 
 NativeThemeWin::~NativeThemeWin() {
   if (theme_dll_) {
     // todo (cpu): fix this soon.  Making a call to CloseHandles() here breaks
     // certain tests and the reliability bots.
     // CloseHandles();
     FreeLibrary(theme_dll_);
   }
 }
 
-void NativeThemeWin::OnSysColorChange() {
-  UpdateSystemColors();
-  is_using_high_contrast_valid_ = false;
-}
-
 void NativeThemeWin::UpdateSystemColors() {
   for (int i = 0; i < arraysize(kSystemColors); ++i) {
     system_colors_[kSystemColors[i]] =
         color_utils::GetSysSkColor(kSystemColors[i]);
   }
 }
 
 void NativeThemeWin::PaintDirect(SkCanvas* canvas,
                                  Part part,
                                  State state,
@@ skipping 1736 matching lines @@
     handle = open_theme_(NULL, L"Spin");
     break;
   default:
     NOTREACHED();
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace ui