Rework gfx::Font by moving platform-specific code into inner classes....

app/win_util.cc

 // Copyright (c) 2009 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 "app/win_util.h"
 
 #include <commdlg.h>
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 523 matching lines @@
     caption_ptr = localized_caption.c_str();
 
   return ::MessageBox(hwnd, text_ptr, caption_ptr, actual_flags);
 }
 
 gfx::Font GetWindowTitleFont() {
   NONCLIENTMETRICS ncm;
   win_util::GetNonClientMetrics(&ncm);
   l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
   ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
-  return gfx::Font::CreateFont(caption_font);
+  return gfx::Font(caption_font);
 }
 
 void SetAppIdForWindow(const std::wstring& app_id, HWND hwnd) {
   // This functionality is only available on Win7+.
   if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7)
     return;
 
   // Load Shell32.dll into memory.
   // TODO(brg): Remove this mechanism when the Win7 SDK is available in trunk.
   std::wstring shell32_filename(kShell32);
@@ skipping 35 matching lines @@
   base::ScopedNativeLibrary user32(
       FilePath(base::GetNativeLibraryName(L"user32")));
   typedef BOOL (*SetProcessDPIAwareFunc)();
   SetProcessDPIAwareFunc set_process_dpi_aware =
       (SetProcessDPIAwareFunc)user32.GetFunctionPointer("SetProcessDPIAware");
   if (set_process_dpi_aware)
     set_process_dpi_aware();
 }
 
 }  // namespace win_util