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

views/window/custom_frame_view.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/window/custom_frame_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #if defined(OS_WIN)
 #include "app/win_util.h"
@@ skipping 262 matching lines @@
   return kTitlebarTopAndBottomEdgeThickness +
       (ShouldShowClientEdge() ? kClientEdgeThickness : 0);
 }
 
 int CustomFrameView::IconSize() const {
 #if defined(OS_WIN)
   // This metric scales up if either the titlebar height or the titlebar font
   // size are increased.
   return GetSystemMetrics(SM_CYSMICON);
 #else
-  return std::max(title_font_->height(), kIconMinimumSize);
+  return std::max(title_font_->GetHeight(), kIconMinimumSize);
 #endif
 }
 
 bool CustomFrameView::ShouldShowClientEdge() const {
   return should_show_client_edge_ && !frame_->IsMaximized();
 }
 
 gfx::Rect CustomFrameView::IconBounds() const {
   int size = IconSize();
   int frame_thickness = FrameBorderThickness();
@@ skipping 240 matching lines @@
   // The window title is based on the calculated icon position, even when there
   // is no icon.
   gfx::Rect icon_bounds(IconBounds());
   views::WindowDelegate* d = frame_->GetDelegate();
   if (d->ShouldShowWindowIcon())
     window_icon_->SetBounds(icon_bounds);
 
   // Size the title.
   int title_x = d->ShouldShowWindowIcon() ?
       icon_bounds.right() + kIconTitleSpacing : icon_bounds.x();
-  int title_height = title_font_->height();
+  int title_height = title_font_->GetHeight();
   // We bias the title position so that when the difference between the icon and
   // title heights is odd, the extra pixel of the title is above the vertical
   // midline rather than below.  This compensates for how the icon is already
   // biased downwards (see IconBounds()) and helps prevent descenders on the
   // title from overlapping the 3D edge at the bottom of the titlebar.
   title_bounds_.SetRect(title_x,
       icon_bounds.y() + ((icon_bounds.height() - title_height - 1) / 2),
       std::max(0, (should_show_minmax_buttons_ ?
           minimize_button_->x() : close_button_->x()) - kTitleCaptionSpacing -
       title_x), title_height);
@@ skipping 15 matching lines @@
     title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #elif defined(OS_LINUX)
     // TODO(ben): need to resolve what font this is.
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }
 
 }  // namespace views