Move a bunch of windows stuff from ui/base/win to ui/gfx/win

ui/gfx/font_smoothing_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/gfx/font_smoothing_win.h"
 
 #include "base/memory/singleton.h"
-#include "ui/base/win/singleton_hwnd.h"
+#include "ui/gfx/win/singleton_hwnd.h"
 
 namespace {
 
 // Helper class to cache font smoothing settings and listen for notifications
 // to re-query them from the system.
-class CachedFontSmoothingSettings : public ui::SingletonHwnd::Observer {
+class CachedFontSmoothingSettings : public gfx::SingletonHwnd::Observer {
  public:
   static CachedFontSmoothingSettings* GetInstance();
 
   // Returns the cached Windows font smoothing settings. Queries the settings
   // via Windows APIs and begins listening for changes when called for the
   // first time.
   void GetFontSmoothingSettings(bool* smoothing_enabled,
                                 bool* cleartype_enabled);
 
  private:
@@ skipping 34 matching lines @@
 
 void CachedFontSmoothingSettings::GetFontSmoothingSettings(
     bool* smoothing_enabled,
     bool* cleartype_enabled) {
   // If cached settings are stale, query them from the OS.
   if (need_to_query_settings_) {
     QueryFontSettings();
     need_to_query_settings_ = false;
   }
   if (!observer_added_) {
-    ui::SingletonHwnd::GetInstance()->AddObserver(this);
+    gfx::SingletonHwnd::GetInstance()->AddObserver(this);
     observer_added_ = true;
   }
   *smoothing_enabled = smoothing_enabled_;
   *cleartype_enabled = cleartype_enabled_;
 }
 
 CachedFontSmoothingSettings::CachedFontSmoothingSettings()
     : observer_added_(false),
       need_to_query_settings_(true),
       smoothing_enabled_(false),
@@ skipping 32 matching lines @@
 namespace gfx {
 
 void GetCachedFontSmoothingSettings(bool* smoothing_enabled,
                                     bool* cleartype_enabled) {
   CachedFontSmoothingSettings::GetInstance()->GetFontSmoothingSettings(
       smoothing_enabled,
       cleartype_enabled);
 }
 
 }  // namespace gfx