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

chrome/browser/views/about_chrome_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/about_chrome_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 269 matching lines @@
   // Create a label and add the full text so we can query it for the height.
   views::Label dummy_text(full_text);
   dummy_text.SetMultiLine(true);
   gfx::Font font =
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
 
   // Add up the height of the various elements on the page.
   int height = about_background_logo->height() +
                kRelatedControlVerticalSpacing +
                // Copyright line.
-               font.height() +
+               font.GetHeight() +
                // Main label.
                dummy_text.GetHeightForWidth(
                    dialog_dimensions_.width() - (2 * kPanelHorizMargin)) +
                kRelatedControlVerticalSpacing;
 
 #if defined(GOOGLE_CHROME_BUILD)
   std::vector<size_t> url_offsets;
   text = l10n_util::GetStringF(IDS_ABOUT_TERMS_OF_SERVICE,
                                std::wstring(),
                                std::wstring(),
@@ skipping 189 matching lines @@
                            chromium_url_rect_.y(),
                            chromium_url_rect_.width(),
                            chromium_url_rect_.height());
   // Then position the Open Source URL within the main label.
   open_source_url_->SetBounds(open_source_url_rect_.x(),
                               open_source_url_rect_.y(),
                               open_source_url_rect_.width(),
                               open_source_url_rect_.height());
 
   // Save the height so we can set the bounds correctly.
-  main_text_label_height_ = position.height() + font.height();
+  main_text_label_height_ = position.height() + font.GetHeight();
 }
 
 void AboutChromeView::ViewHierarchyChanged(bool is_add,
                                            views::View* parent,
                                            views::View* child) {
   // Since we want some of the controls to show up in the same visual row
   // as the buttons, which are provided by the framework, we must add the
   // buttons to the non-client view, which is the parent of this view.
   // Similarly, when we're removed from the view hierarchy, we must take care
   // to remove these items as well.
@@ skipping 303 matching lines @@
   View* parent = GetParent();
   parent->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
   if (window())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif