ChromeFont->gfx::Font...

chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc

 // Copyright (c) 2009 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/autocomplete/autocomplete_popup_contents_view.h"
 
 #include <objidl.h>
 #include <commctrl.h>
 #include <dwmapi.h>
 
@@ skipping 42 matching lines @@
 // kIconVerticalPadding.
 static const int kTextVerticalPadding = 3;
 // The padding at the left edge of the row, left of the icon.
 static const int kRowLeftPadding = 6;
 // The padding on the right edge of the row, right of the text.
 static const int kRowRightPadding = 3;
 // The horizontal distance between the right edge of the icon and the left edge
 // of the text.
 static const int kIconTextSpacing = 9;
 // The size delta between the font used for the edit and the result rows. Passed
-// to ChromeFont::DeriveFont.
+// to gfx::Font::DeriveFont.
 static const int kEditFontAdjust = -1;
 
 class AutocompleteResultView : public views::View {
  public:
   AutocompleteResultView(AutocompleteResultViewModel* model,
                          int model_index,
-                         const ChromeFont& font);
+                         const gfx::Font& font);
   virtual ~AutocompleteResultView();
 
   // Overridden from views::View:
   virtual void Paint(ChromeCanvas* canvas);
   virtual void Layout();
   virtual gfx::Size GetPreferredSize();
   virtual void OnMouseEntered(const views::MouseEvent& event);
   virtual void OnMouseMoved(const views::MouseEvent& event);
   virtual void OnMouseExited(const views::MouseEvent& event);
   virtual bool OnMousePressed(const views::MouseEvent& event);
@@ skipping 20 matching lines @@
 
   // Draws an individual sub-fragment with the specified style. Returns the x
   // position to the right of the fragment.
   int DrawStringFragment(ChromeCanvas* canvas,
                          const std::wstring& text,
                          int style,
                          int x,
                          int y);
 
   // Gets the font and text color for a fragment with the specified style.
-  ChromeFont GetFragmentFont(int style) const;
+  gfx::Font GetFragmentFont(int style) const;
   SkColor GetFragmentTextColor(int style) const;
 
   // This row's model and model index.
   AutocompleteResultViewModel* model_;
   size_t model_index_;
 
   // True if the mouse is over this row.
   bool hot_;
 
   // The font used to derive fonts for rendering the text in this row.
-  ChromeFont font_;
+  gfx::Font font_;
 
   // A context used for mirroring regions.
   class MirroringContext;
   scoped_ptr<MirroringContext> mirroring_context_;
 
   // Layout rects for various sub-components of the view.
   gfx::Rect icon_bounds_;
   gfx::Rect text_bounds_;
 
   // Icons for rows.
@@ skipping 132 matching lines @@
 }
 
 int AutocompleteResultView::MirroringContext::GetLeft(int x1, int x2) const {
   return mirrored_ ?
       (center_x_ + (center_x_ - std::max(x1, x2))) : std::min(x1, x2);
 }
 
 AutocompleteResultView::AutocompleteResultView(
     AutocompleteResultViewModel* model,
     int model_index,
-    const ChromeFont& font)
+    const gfx::Font& font)
     : model_(model),
       model_index_(model_index),
       hot_(false),
       font_(font),
       mirroring_context_(new MirroringContext()) {
   InitClass();
 }
 
 AutocompleteResultView::~AutocompleteResultView() {
 }
@@ skipping 206 matching lines @@
   }
   return x;
 }
 
 int AutocompleteResultView::DrawStringFragment(
     ChromeCanvas* canvas,
     const std::wstring& text,
     int style,
     int x,
     int y) {
-  ChromeFont display_font = GetFragmentFont(style);
+  gfx::Font display_font = GetFragmentFont(style);
   // Clamp text width to the available width within the popup so we elide if
   // necessary.
   int string_width = std::min(display_font.GetStringWidth(text),
                               width() - kRowRightPadding - x);
   int string_left = mirroring_context_->GetLeft(x, x + string_width);
   canvas->DrawStringInt(text, GetFragmentFont(style),
                         GetFragmentTextColor(style), string_left, y,
                         string_width, display_font.height());
   return string_width;
 }
 
-ChromeFont AutocompleteResultView::GetFragmentFont(int style) const {
+gfx::Font AutocompleteResultView::GetFragmentFont(int style) const {
   if (style & ACMatchClassification::MATCH)
-    return font_.DeriveFont(0, ChromeFont::BOLD);
+    return font_.DeriveFont(0, gfx::Font::BOLD);
   return font_;
 }
 
 SkColor AutocompleteResultView::GetFragmentTextColor(int style) const {
   bool selected = model_->IsSelectedIndex(model_index_);
   if (style & ACMatchClassification::URL) {
     // TODO(beng): bring over the contrast logic from the old popup and massage
     //             these values. See autocomplete_popup_view_win.cc and
     //             LuminosityContrast etc.
     return selected ? kHighlightURLColor : kStandardURLColor;
@@ skipping 117 matching lines @@
     dropshadow_bottom_ = rb.GetBitmapNamed(IDR_OMNIBOX_POPUP_DS_B);
     dropshadow_bottomleft_ = rb.GetBitmapNamed(IDR_OMNIBOX_POPUP_DS_BL);
     initialized = true;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, public:
 
 AutocompletePopupContentsView::AutocompletePopupContentsView(
-    const ChromeFont& font,
+    const gfx::Font& font,
     AutocompleteEditViewWin* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
     AutocompletePopupPositioner* popup_positioner)
     : popup_(new AutocompletePopupWin(this)),
       model_(new AutocompletePopupModel(this, edit_model, profile)),
       edit_view_(edit_view),
       popup_positioner_(popup_positioner),
       result_font_(font.DeriveFont(kEditFontAdjust)) {
   set_border(new PopupBorder);
@@ skipping 204 matching lines @@
   // Allow the window blur effect to show through the popup background.
   SkPaint paint;
   SkColor transparency = win_util::ShouldUseVistaFrame() ?
       kGlassPopupTransparency : kOpaquePopupTransparency;
   paint.setColor(SkColorSetARGB(transparency, 255, 255, 255));
   paint.setPorterDuffXfermode(SkPorterDuff::kDstIn_Mode);
   paint.setStyle(SkPaint::kFill_Style);
   canvas->FillRectInt(0, 0, canvas->getDevice()->width(),
                       canvas->getDevice()->height(), paint);
 }