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

views/controls/menu/menu_config_win.cc

 // Copyright (c) 2010 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 "views/controls/menu/menu_config.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
 
@@ skipping 12 matching lines @@
 
   config->text_color = NativeTheme::instance()->GetThemeColorWithDefault(
       NativeTheme::MENU, MENU_POPUPITEM, MPI_NORMAL, TMT_TEXTCOLOR,
       COLOR_MENUTEXT);
 
   NONCLIENTMETRICS metrics;
   win_util::GetNonClientMetrics(&metrics);
   l10n_util::AdjustUIFont(&(metrics.lfMenuFont));
   HFONT font = CreateFontIndirect(&metrics.lfMenuFont);
   DLOG_ASSERT(font);
-  config->font = gfx::Font::CreateFont(font);
+  config->font = gfx::Font(font);
 
   HDC dc = GetDC(NULL);
   RECT bounds = { 0, 0, 200, 200 };
   SIZE check_size;
   if (NativeTheme::instance()->GetThemePartSize(
           NativeTheme::MENU, dc, MENU_POPUPCHECK, MC_CHECKMARKNORMAL, &bounds,
           TS_TRUE, &check_size) == S_OK) {
     config->check_width = check_size.cx;
     config->check_height = check_size.cy;
   } else {
@@ skipping 48 matching lines @@
   ReleaseDC(NULL, dc);
 
   BOOL show_cues;
   config->show_mnemonics =
       (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) &&
        show_cues == TRUE);
   return config;
 }
 
 }  // namespace views