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

chrome/browser/views/location_bar/location_bar_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/location_bar/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 100 matching lines @@
     font_ = ResourceBundle::GetSharedInstance().GetFont(
         ResourceBundle::BaseFont);
   } else {
     // Use a larger version of the system font.
     font_ = font_.DeriveFont(3);
   }
 
   // If this makes the font too big, try to make it smaller so it will fit.
   const int height =
       std::max(GetPreferredSize().height() - (kVerticalEdgeThickness * 2), 0);
-  while ((font_.height() > height) && (font_.FontSize() > 1))
+  while ((font_.GetHeight() > height) && (font_.GetFontSize() > 1))
     font_ = font_.DeriveFont(-1);
 
   location_icon_view_ = new LocationIconView(this);
   AddChildView(location_icon_view_);
   location_icon_view_->SetVisible(true);
   location_icon_view_->SetDragController(this);
 
   ev_bubble_view_ =
       new EVBubbleView(kEVBubbleBackgroundImages, IDR_OMNIBOX_HTTPS_VALID,
                        GetColor(ToolbarModel::EV_SECURE, SECURITY_TEXT), this);
@@ skipping 930 matching lines @@
 
   NOTREACHED();
 }
 
 void LocationBarView::OnTemplateURLModelChanged() {
   template_url_model_->RemoveObserver(this);
   template_url_model_ = NULL;
   ShowFirstRunBubble(bubble_type_);
 }