ChromeFont->gfx::Font...

chrome/browser/views/options/options_group_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 <vsstyle.h>
 #include <vssym32.h>
 
 #include "chrome/browser/views/options/options_group_view.h"
 
 #include "app/gfx/chrome_canvas.h"
@@ skipping 18 matching lines @@
                                    const std::wstring& title,
                                    const std::wstring& description,
                                    bool show_separator)
     : contents_(contents),
       title_label_(new views::Label(title)),
       description_label_(new views::Label(description)),
       separator_(NULL),
       show_separator_(show_separator),
       highlighted_(false) {
   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);
   title_label_->SetMultiLine(true);
   title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
 
   description_label_->SetMultiLine(true);
   description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
@@ skipping 34 matching lines @@
 // OptionsGroupView, private:
 
 void OptionsGroupView::Init() {
   using views::GridLayout;
   using views::ColumnSet;
 
   GridLayout* layout = new GridLayout(this);
   SetLayoutManager(layout);
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  ChromeFont font = rb.GetFont(ResourceBundle::BaseFont);
+  gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
   std::wstring left_column_chars =
       l10n_util::GetString(IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS);
   int left_column_width =
       font.GetExpectedTextWidth(_wtoi(left_column_chars.c_str()));
 
   const int two_column_layout_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(two_column_layout_id);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
                         GridLayout::FIXED, left_column_width, 0);
@@ skipping 21 matching lines @@
     const int single_column_layout_id = 1;
     column_set = layout->AddColumnSet(single_column_layout_id);
     column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                           GridLayout::USE_PREF, 0, 0);
 
     separator_ = new views::Separator;
     layout->StartRow(0, single_column_layout_id);
     layout->AddView(separator_);
   }
 }