ChromeFont->gfx::Font...

chrome/browser/autocomplete/autocomplete_edit_view_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
@@ skipping 42 matching lines @@
         : selection(selection),
           saved_selection_for_focus_change(saved_selection_for_focus_change) {
     }
 
     const CHARRANGE selection;
     const CHARRANGE saved_selection_for_focus_change;
   };
 
   DECLARE_WND_CLASS(L"Chrome_AutocompleteEditView");
 
-  AutocompleteEditViewWin(const ChromeFont& font,
+  AutocompleteEditViewWin(const gfx::Font& font,
                           AutocompleteEditController* controller,
                           ToolbarModel* toolbar_model,
                           views::View* parent_view,
                           HWND hwnd,
                           Profile* profile,
                           CommandUpdater* command_updater,
                           bool popup_window_mode,
                           AutocompletePopupPositioner* popup_positioner);
   ~AutocompleteEditViewWin();
 
@@ skipping 347 matching lines @@
 
   // Holds the user's selection across focus changes.  cpMin holds -1 when
   // there is no saved selection.
   CHARRANGE saved_selection_for_focus_change_;
 
   // The context menu for the edit.
   scoped_ptr<views::Menu> context_menu_;
 
   // Font we're using.  We keep a reference to make sure the font supplied to
   // the constructor doesn't go away before we do.
-  ChromeFont font_;
+  gfx::Font font_;
 
   // Metrics about the font, which we keep so we don't need to recalculate them
   // every time we paint.  |font_y_adjustment_| is the number of pixels we need
   // to shift the font vertically in order to make its baseline be at our
   // desired baseline in the edit.
   int font_ascent_;
   int font_descent_;
   int font_x_height_;
   int font_y_adjustment_;
 
@@ skipping 23 matching lines @@
   // striken-out when displaying an insecure scheme.
   url_parse::Component insecure_scheme_component_;
 
   // Instance of accessibility information and handling.
   mutable CComPtr<IAccessible> autocomplete_accessibility_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewWin);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_