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

views/controls/menu/menu_item_view_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_item_view.h"
 
 #include <uxtheme.h>
 #include <Vssym32.h>
 
 #include "gfx/canvas_skia.h"
 #include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/submenu_view.h"
 
 using gfx::NativeTheme;
 
 namespace views {
 
 gfx::Size MenuItemView::GetPreferredSize() {
   const gfx::Font& font = MenuConfig::instance().font;
   return gfx::Size(
       font.GetStringWidth(title_) + label_start_ + item_right_margin_ +
           GetChildPreferredWidth(),
-      font.height() + GetBottomMargin() + GetTopMargin());
+      font.GetHeight() + GetBottomMargin() + GetTopMargin());
 }
 
 void MenuItemView::Paint(gfx::Canvas* canvas, bool for_drag) {
   const MenuConfig& config = MenuConfig::instance();
   bool render_selection =
       (!for_drag && IsSelected() &&
        parent_menu_item_->GetSubmenu()->GetShowSelection(this) &&
        GetChildViewCount() == 0);
   int state = render_selection ? MPI_HOT :
                                  (IsEnabled() ? MPI_NORMAL : MPI_DISABLED);
@@ skipping 44 matching lines @@
   // Menu color is specific to Vista, fallback to classic colors if can't
   // get color.
   int default_sys_color = render_selection ? COLOR_HIGHLIGHTTEXT :
       (IsEnabled() ? COLOR_MENUTEXT : COLOR_GRAYTEXT);
   SkColor fg_color = NativeTheme::instance()->GetThemeColorWithDefault(
       NativeTheme::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR,
       default_sys_color);
   const gfx::Font& font = MenuConfig::instance().font;
   int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
   int width = this->width() - item_right_margin_ - label_start_ - accel_width;
-  gfx::Rect text_bounds(label_start_, top_margin, width, font.height());
+  gfx::Rect text_bounds(label_start_, top_margin, width, font.GetHeight());
   text_bounds.set_x(MirroredLeftPointForRect(text_bounds));
   if (for_drag) {
     // With different themes, it's difficult to tell what the correct
     // foreground and background colors are for the text to draw the correct
     // halo. Instead, just draw black on white, which will look good in most
     // cases.
     canvas->AsCanvasSkia()->DrawStringWithHalo(
         GetTitle(), font, 0x00000000, 0xFFFFFFFF, text_bounds.x(),
         text_bounds.y(), text_bounds.width(), text_bounds.height(),
         GetRootMenuItem()->GetDrawStringFlags());
@@ skipping 61 matching lines @@
   // And the check.
   gfx::Rect icon_bounds(icon_x / 2, icon_y, icon_width, icon_height);
   AdjustBoundsForRTLUI(&icon_bounds);
   RECT icon_rect = icon_bounds.ToRECT();
   NativeTheme::instance()->PaintMenuCheck(
       NativeTheme::MENU, dc, MENU_POPUPCHECK, state_id, &icon_rect,
       control_state);
 }
 
 }  // namespace views