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

chrome/browser/views/frame/opaque_browser_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 "chrome/browser/views/frame/opaque_browser_frame_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/compiler_specific.h"
@@ skipping 490 matching lines @@
   return kTitlebarTopAndBottomEdgeThickness +
       (frame_->GetWindow()->IsMaximized() ? 0 : kClientEdgeThickness);
 }
 
 int OpaqueBrowserFrameView::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(BrowserFrame::GetTitleFont().height(), kIconMinimumSize);
+  return std::max(BrowserFrame::GetTitleFont().GetHeight(), kIconMinimumSize);
 #endif
 }
 
 gfx::Rect OpaqueBrowserFrameView::IconBounds() const {
   int size = IconSize();
   int frame_thickness = FrameBorderThickness();
   int y;
   views::WindowDelegate* d = frame_->GetWindow()->GetDelegate();
   if (d->ShouldShowWindowIcon() || d->ShouldShowWindowTitle()) {
     // Our frame border has a different "3D look" than Windows'.  Theirs has a
@@ skipping 488 matching lines @@
   // is no icon.
   gfx::Rect icon_bounds(IconBounds());
   views::WindowDelegate* d = frame_->GetWindow()->GetDelegate();
   if (d->ShouldShowWindowIcon())
     window_icon_->SetBounds(icon_bounds);
 
   // Size the title, if visible.
   if (d->ShouldShowWindowTitle()) {
     int title_x = d->ShouldShowWindowIcon() ?
         icon_bounds.right() + kIconTitleSpacing : icon_bounds.x();
-    int title_height = BrowserFrame::GetTitleFont().height();
+    int title_height = BrowserFrame::GetTitleFont().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, minimize_button_->x() - kTitleLogoSpacing - title_x),
         title_height);
   }
@@ skipping 40 matching lines @@
 // static
 gfx::Rect OpaqueBrowserFrameView::GetViewBounds(views::View* src,
                                                 views::View* dst) {
   gfx::Rect bounds(src->bounds());
 
   gfx::Point origin_in_dst(bounds.origin());
   View::ConvertPointToView(src->GetParent(), dst, &origin_in_dst);
   bounds.set_origin(origin_in_dst);
   return bounds;
 }