Make SysColorChangeListener Windows-only instead of having an empty shell.

ui/gfx/sys_color_change_listener.cc

Index: ui/gfx/sys_color_change_listener.cc
diff --git a/ui/gfx/sys_color_change_listener.cc b/ui/gfx/sys_color_change_listener.cc
index 771e5c01851313379be9687bfab5d85162202b44..ef795990718fb7450402c957f804df0c4e8c2bde 100644
--- a/ui/gfx/sys_color_change_listener.cc
+++ b/ui/gfx/sys_color_change_listener.cc
@@ -4,9 +4,7 @@
 
 #include "ui/gfx/sys_color_change_listener.h"
 
-#if defined(OS_WIN)
 #include <windows.h>
-#endif
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ -16,11 +14,7 @@
 #include "base/observer_list.h"
 #include "ui/gfx/color_utils.h"
 
-#if defined(OS_WIN)
 #include "ui/gfx/win/singleton_hwnd_observer.h"

[sadrul, 2015/07/07 04:36:54]

Should be in the previous block of #includes

[mlamouri (slow - plz ping), 2015/07/07 13:45:15]

Done.

-#endif
-
-namespace gfx {
 
 namespace {
 
@@ -28,7 +22,6 @@ bool g_is_inverted_color_scheme = false;
 bool g_is_inverted_color_scheme_initialized = false;
 
 void UpdateInvertedColorScheme() {
-#if defined(OS_WIN)
   int foreground_luminance = color_utils::GetLuminanceForColor(
       color_utils::GetSysSkColor(COLOR_WINDOWTEXT));
   int background_luminance = color_utils::GetLuminanceForColor(
@@ -40,10 +33,11 @@ void UpdateInvertedColorScheme() {
       ((high_contrast.dwFlags & HCF_HIGHCONTRASTON) != 0) &&
       foreground_luminance > background_luminance;
   g_is_inverted_color_scheme_initialized = true;
-#endif
 }
 
-}  // namespace
+}  // anonymous namespace

[sadrul, 2015/07/07 04:36:54]

I hadn't seen us use 'anonymous namespace' like this before. But looks like some
code does use it. Weird.

From a quick search, looks like '// anonymous namespace' like this is used ~300
times, and just '// namespace' is used ~10K times in the chrome tree. So leave
it as '// namespace'?

[mlamouri (slow - plz ping), 2015/07/07 13:45:15]

If you want.

+
+namespace color_utils {
 
 bool IsInvertedColorScheme() {
   if (!g_is_inverted_color_scheme_initialized)
@@ -51,7 +45,10 @@ bool IsInvertedColorScheme() {
   return g_is_inverted_color_scheme;
 }
 
-#if defined(OS_WIN)
+}  // namespace color_utils
+
+namespace gfx {
+
 class SysColorChangeObserver {
  public:
   static SysColorChangeObserver* GetInstance();
@@ -101,20 +98,15 @@ void SysColorChangeObserver::OnWndProc(HWND hwnd,
     FOR_EACH_OBSERVER(SysColorChangeListener, listeners_, OnSysColorChange());
   }
 }
-#endif
 
 ScopedSysColorChangeListener::ScopedSysColorChangeListener(
     SysColorChangeListener* listener)
     : listener_(listener) {
-#if defined(OS_WIN)
   SysColorChangeObserver::GetInstance()->AddListener(listener_);
-#endif
 }
 
 ScopedSysColorChangeListener::~ScopedSysColorChangeListener() {
-#if defined(OS_WIN)
   SysColorChangeObserver::GetInstance()->RemoveListener(listener_);
-#endif
 }
 
 }  // namespace gfx