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

chrome/browser/views/options/languages_page_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 <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "chrome/browser/views/options/languages_page_view.h"
@@ skipping 124 matching lines @@
 void AddLanguageWindowView::Layout() {
   gfx::Size sz = accept_language_combobox_->GetPreferredSize();
   accept_language_combobox_->SetBounds(kDialogPadding, kDialogPadding,
                                        width() - 2*kDialogPadding,
                                        sz.height());
 }
 
 gfx::Size AddLanguageWindowView::GetPreferredSize() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& font = rb.GetFont(ResourceBundle::BaseFont);
-  return gfx::Size(font.ave_char_width() * kDefaultWindowWidthChars,
-                   font.height() * kDefaultWindowHeightLines);
+  return gfx::Size(font.GetAverageCharacterWidth() * kDefaultWindowWidthChars,
+                   font.GetHeight() * kDefaultWindowHeightLines);
 }
 
 void AddLanguageWindowView::ViewHierarchyChanged(bool is_add,
                                                  views::View* parent,
                                                  views::View* child) {
   // Can't init before we're inserted into a Widget, because we require
   // a HWND to parent native child controls to.
   if (is_add && child == this)
     Init();
 }
@@ skipping 413 matching lines @@
   }
 
   if (enable_spellcheck_checkbox_clicked_)
     enable_spellcheck_.SetValue(enable_spellchecking_checkbox_->checked());
 
   if (enable_autospellcorrect_checkbox_clicked_) {
     enable_autospellcorrect_.SetValue(
         enable_autospellcorrect_checkbox_->checked());
   }
 }