ChromeFont->gfx::Font...

chrome/browser/autocomplete/autocomplete_popup_view_win.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/autocomplete/autocomplete_popup_view_win.h"
 
 // TODO(deanm): Clean up these includes, not going to fight it now.
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
@@ skipping 69 matching lines @@
 }
 
 int AutocompletePopupViewWin::MirroringContext::GetLeft(int x1, int x2) const {
   return enabled_ ?
       (center_x_ + (center_x_ - std::max(x1, x2))) : std::min(x1, x2);
 }
 
 const wchar_t AutocompletePopupViewWin::DrawLineInfo::ellipsis_str[] =
     L"\x2026";
 
-AutocompletePopupViewWin::DrawLineInfo::DrawLineInfo(const ChromeFont& font) {
+AutocompletePopupViewWin::DrawLineInfo::DrawLineInfo(const gfx::Font& font) {
   // Create regular and bold fonts.
   regular_font = font.DeriveFont(-1);
-  bold_font = regular_font.DeriveFont(0, ChromeFont::BOLD);
+  bold_font = regular_font.DeriveFont(0, gfx::Font::BOLD);
 
   // The total padding added to each line (bottom padding is what is
   // left over after DrawEntry() specifies its top offset).
   static const int kTotalLinePadding = 5;
   font_height = std::max(regular_font.height(), bold_font.height());
   line_height = font_height + kTotalLinePadding;
   ave_char_width = regular_font.GetExpectedTextWidth(1);
   ellipsis_width = std::max(regular_font.GetStringWidth(ellipsis_str),
                             bold_font.GetStringWidth(ellipsis_str));
 
@@ skipping 75 matching lines @@
   return RGB(
     ((GetRValue(foreground) * alpha) +
      (GetRValue(background) * (0xff - alpha))) / 0xff,
     ((GetGValue(foreground) * alpha) +
      (GetGValue(background) * (0xff - alpha))) / 0xff,
     ((GetBValue(foreground) * alpha) +
      (GetBValue(background) * (0xff - alpha))) / 0xff);
 }
 
 AutocompletePopupViewWin::AutocompletePopupViewWin(
-    const ChromeFont& font,
+    const gfx::Font& font,
     AutocompleteEditViewWin* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile)
     : model_(new AutocompletePopupModel(this, edit_model, profile)),
       edit_view_(edit_view),
       line_info_(font),
       mirroring_context_(new MirroringContext()),
       star_(ResourceBundle::GetSharedInstance().GetBitmapNamed(
           IDR_CONTENT_STAR_ON)) {
 }
@@ skipping 473 matching lines @@
   ChromeCanvas canvas(star_->width(), star_->height(), false);
   // Make the background completely transparent.
   canvas.drawColor(SK_ColorBLACK, SkPorterDuff::kClear_Mode);
   canvas.DrawBitmapInt(*star_, 0, 0);
   canvas.getTopPlatformDevice().drawToHDC(
       dc, mirroring_context_->GetLeft(x, x + star_->width()), y, NULL);
 }
 
 // static
 AutocompletePopupView* AutocompletePopupView::CreatePopupView(
-    const ChromeFont& font,
+    const gfx::Font& font,
     AutocompleteEditViewWin* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
     AutocompletePopupPositioner* popup_positioner) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableOmnibox2)) {
     return new AutocompletePopupContentsView(font, edit_view, edit_model,
                                              profile, popup_positioner);
   }
   return new AutocompletePopupViewWin(font, edit_view, edit_model, profile);
 }