ChromeFont->gfx::Font...

chrome/browser/views/options/fonts_page_view.cc

 // Copyright (c) 2006-2008 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 89 matching lines @@
  public:
   FontDisplayView();
   virtual ~FontDisplayView();
 
   // This method takes in font size in pixel units, instead of the normal point
   // unit because users expect the font size number to represent pixels and not
   // points.
   void SetFontType(const std::wstring& font_name,
                    int font_size);
 
-  void SetFontType(ChromeFont font);
+  void SetFontType(gfx::Font font);
 
   std::wstring font_name() { return font_name_; }
   int font_size() { return font_size_; }
 
   // views::View overrides:
   virtual void Paint(ChromeCanvas* canvas);
   virtual void Layout();
   virtual gfx::Size GetPreferredSize();
 
  private:
@@ skipping 10 matching lines @@
 };
 
 FontDisplayView::FontDisplayView()
     : font_text_label_(new views::Label) {
   AddChildView(font_text_label_);
 }
 
 FontDisplayView::~FontDisplayView() {
 }
 
-void FontDisplayView::SetFontType(ChromeFont font) {
+void FontDisplayView::SetFontType(gfx::Font font) {
   if (font.FontName().empty())
     return;
 
   font_name_ = font.FontName();
   font_size_ = font.FontSize();
 
   // Append the font type and size here.
   std::wstring displayed_text = font_name_;
   displayed_text += L", ";
   displayed_text += UTF8ToWide(StringPrintf("%d", font_size_));
@@ skipping 11 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));
-  ChromeFont font = ChromeFont::CreateFont(font_name, font_size_point);
+  gfx::Font font = gfx::Font::CreateFont(font_name, font_size_point);
   font_text_label_->SetFont(font);
   font_text_label_->SetText(displayed_text);
 }
 
 void FontDisplayView::Paint(ChromeCanvas* 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);
   canvas->endPlatformPaint();
 }
 
 void FontDisplayView::Layout() {
   font_text_label_->SetBounds(0, 0, width(), height());
 }
 
 gfx::Size FontDisplayView::GetPreferredSize() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  ChromeFont font = rb.GetFont(ResourceBundle::BaseFont);
+  gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
   return gfx::Size(font.GetExpectedTextWidth(kFontDisplayMaxWidthChars),
                    font.height() * kFontDisplayMaxHeightChars
                        + 2 * kFontDisplayLabelPadding);
 }
 
 void EmbellishTitle(views::Label* title_label) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  ChromeFont title_font =
-      rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, ChromeFont::BOLD);
+  gfx::Font title_font =
+      rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD);
   title_label->SetFont(title_font);
   SkColor title_color =
       gfx::NativeTheme::instance()->GetThemeColorWithDefault(
           gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR,
           COLOR_WINDOWTEXT);
   title_label->SetColor(title_color);
 }
 
 FontsPageView::FontsPageView(Profile* profile)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
@@ skipping 66 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 ChromeFont& const_font, void* params) {
-  ChromeFont font(const_font);
-  if (ChromeFont(font).FontName().empty())
+void FontsPageView::FontSelected(const gfx::Font& const_font, void* params) {
+  gfx::Font font(const_font);
+  if (gfx::Font(font).FontName().empty())
     return;
-  int font_size = ChromeFont(font).FontSize();
+  int font_size = gfx::Font(font).FontSize();
   // 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(),
         serif_font_size_pixel_);
     sans_serif_font_display_view_->SetFontType(
         sans_serif_font_display_view_->font_name(),
@@ skipping 132 matching lines @@
   using views::GridLayout;
   using views::ColumnSet;
 
   fonts_contents_ = new views::View;
   GridLayout* layout = new GridLayout(fonts_contents_);
   fonts_contents_->SetLayoutManager(layout);
 
   const int triple_column_view_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(triple_column_view_set_id);
 
-  int label_width = ChromeFont().GetExpectedTextWidth(
+  int label_width = gfx::Font().GetExpectedTextWidth(
       _wtoi(l10n_util::GetString(IDS_FONTSLANG_LABEL_WIDTH).c_str()));
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::FIXED, label_width, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
@@ skipping 52 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);
 }