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

views/controls/menu/menu_item_view_gtk.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 "views/controls/menu/menu_item_view.h"
 
 #include "app/resource_bundle.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/favicon_size.h"
 #include "grit/app_resources.h"
@@ skipping 26 matching lines @@
 static const SkColor kRadioButtonIndicatorGradient1 =
     SkColorSetRGB(0x83, 0x83, 0x83);
 
 static const SkColor kIndicatorStroke = SkColorSetRGB(0, 0, 0);
 
 gfx::Size MenuItemView::GetPreferredSize() {
   const gfx::Font& font = MenuConfig::instance().font;
   // TODO(sky): this is a workaround until I figure out why font.height()
   // isn't returning the right thing. We really only want to include
   // kFavIconSize if we're showing icons.
-  int content_height = std::max(kFavIconSize, font.height());
+  int content_height = std::max(kFavIconSize, font.GetHeight());
   return gfx::Size(
       font.GetStringWidth(title_) + label_start_ + item_right_margin_ +
           GetChildPreferredWidth(),
       content_height + GetBottomMargin() + GetTopMargin());
 }
 
 void MenuItemView::Paint(gfx::Canvas* canvas, bool for_drag) {
   const MenuConfig& config = MenuConfig::instance();
   bool render_selection =
       (!for_drag && IsSelected() &&
@@ skipping 90 matching lines @@
   SkColor fg_color =
       IsEnabled() ? SK_ColorBLACK : SkColorSetRGB(0x80, 0x80, 0x80);
 #else
   SkColor fg_color =
       IsEnabled() ? TextButton::kEnabledColor : TextButton::kDisabledColor;
 #endif
   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 +
-                        (available_height - font.height()) / 2, width,
-                        font.height());
+                        (available_height - font.GetHeight()) / 2, width,
+                        font.GetHeight());
   text_bounds.set_x(MirroredLeftPointForRect(text_bounds));
   canvas->DrawStringInt(GetTitle(), font, fg_color,
                         text_bounds.x(), text_bounds.y(), text_bounds.width(),
                         text_bounds.height(),
                         GetRootMenuItem()->GetDrawStringFlags());
 
   PaintAccelerator(canvas);
 
   // Render the icon.
   if (icon_.width() > 0) {
@@ skipping 14 matching lines @@
                                          config.arrow_width) / 2,
                            config.arrow_width, height());
     AdjustBoundsForRTLUI(&arrow_bounds);
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     canvas->DrawBitmapInt(*rb.GetBitmapNamed(IDR_MENU_ARROW),
                           arrow_bounds.x(), arrow_bounds.y());
   }
 }
 
 }  // namespace views