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

views/controls/menu/menu_win.cc

Index: views/controls/menu/menu_win.cc
===================================================================
--- views/controls/menu/menu_win.cc	(revision 55911)
+++ views/controls/menu/menu_win.cc	(working copy)
@@ -112,7 +112,7 @@
       // If the label contains an accelerator, make room for tab.
       if (data->label.find(L'\t') != std::wstring::npos)
         lpmis->itemWidth += font.GetStringWidth(L" ");
-      lpmis->itemHeight = font.height() + kItemBottomMargin + kItemTopMargin;
+      lpmis->itemHeight = font.GetHeight() + kItemBottomMargin + kItemTopMargin;
     } else {
       // Measure separator size.
       lpmis->itemHeight = GetSystemMetrics(SM_CYMENU) / 2;
@@ -158,8 +158,9 @@
       if (!underline_mnemonics)
         format |= DT_HIDEPREFIX;
       gfx::Font font;
-      HGDIOBJ old_font = static_cast<HFONT>(SelectObject(hDC, font.hfont()));
-      int fontsize = font.FontSize();
+      HGDIOBJ old_font =
+          static_cast<HFONT>(SelectObject(hDC, font.GetNativeFont()));
+      int fontsize = font.GetFontSize();
 
       // If an accelerator is specified (with a tab delimiting the rest of the
       // label from the accelerator), we have to justify the fist part on the