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

chrome/browser/views/options/fonts_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 "chrome/browser/views/options/fonts_page_view.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 72 matching lines @@
 
   font_name_ = font_name;
   font_size_ = font_size;
   std::wstring displayed_text = font_name_;
 
   // Append the font type and size.
   displayed_text += L", ";
   displayed_text += UTF8ToWide(::StringPrintf("%d", font_size_));
   HDC hdc = GetDC(NULL);
   int font_size_point = MulDiv(font_size, 72, GetDeviceCaps(hdc, LOGPIXELSY));
-  gfx::Font font = gfx::Font::CreateFont(font_name, font_size_point);
+  gfx::Font font = gfx::Font(font_name, font_size_point);
   font_text_label_->SetFont(font);
   font_text_label_->SetText(displayed_text);
 }
 
 void FontDisplayView::Paint(gfx::Canvas* canvas) {
   HDC dc = canvas->BeginPlatformPaint();
   RECT rect = { 0, 0, width(), height() };
   gfx::NativeTheme::instance()->PaintTextField(
       dc, EP_BACKGROUND, EBS_NORMAL, 0, &rect, ::GetSysColor(COLOR_3DFACE),
       true, true);
@@ skipping 95 matching lines @@
   if (combo_box == default_encoding_combobox_) {
     if (prev_index != new_index) {  // Default-Encoding has been changed.
       encoding_dropdown_clicked_ = true;
       default_encoding_selected_ = default_encoding_combobox_model_->
           GetEncodingCharsetByIndex(new_index);
       default_encoding_changed_ = true;
     }
   }
 }
 
-void FontsPageView::FontSelected(const gfx::Font& const_font, void* params) {
-  gfx::Font font(const_font);
-  if (gfx::Font(font).FontName().empty())
+void FontsPageView::FontSelected(const gfx::Font& font, void* params) {
+  if (font.GetFontName().empty())
     return;
-  int font_size = gfx::Font(font).FontSize();
+  int font_size = font.GetFontSize();
   // Currently we do not have separate font sizes for Serif and Sans Serif.
   // Therefore, when Serif font size is changed, Sans-Serif font size changes,
   // and vice versa.
   if (font_type_being_changed_ == SERIF) {
     sans_serif_font_size_pixel_ = serif_font_size_pixel_ = font_size;
     serif_font_display_view_->SetFontType(
-        font.FontName(),
+        font.GetFontName(),
         serif_font_size_pixel_);
     sans_serif_font_display_view_->SetFontType(
         sans_serif_font_display_view_->font_name(),
         sans_serif_font_size_pixel_);
   } else if (font_type_being_changed_ == SANS_SERIF) {
     sans_serif_font_size_pixel_ = serif_font_size_pixel_ = font_size;
     sans_serif_font_display_view_->SetFontType(
-        font.FontName(),
+        font.GetFontName(),
         sans_serif_font_size_pixel_);
     serif_font_display_view_->SetFontType(
         serif_font_display_view_->font_name(),
         sans_serif_font_size_pixel_);
   } else if (font_type_being_changed_ == FIXED_WIDTH) {
     fixed_width_font_size_pixel_ = font_size;
-    fixed_width_font_display_view_->SetFontType(font.FontName(), font_size);
+    fixed_width_font_display_view_->SetFontType(font.GetFontName(), font_size);
   }
   font_changed_ = true;
 }
 
 void FontsPageView::SaveChanges() {
   // Set Fonts.
   if (font_changed_) {
     serif_name_.SetValue(WideToUTF8(serif_font_display_view_->font_name()));
     serif_size_.SetValue(serif_font_size_pixel_);
     sans_serif_name_.SetValue(
@@ skipping 181 matching lines @@
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   // Add Encoding Combobox.
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(default_encoding_combobox_label_);
   layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL,
       GridLayout::CENTER);
 }