| Index: chrome/browser/autocomplete/autocomplete_popup_view_win.cc
 | 
| ===================================================================
 | 
| --- chrome/browser/autocomplete/autocomplete_popup_view_win.cc	(revision 16106)
 | 
| +++ chrome/browser/autocomplete/autocomplete_popup_view_win.cc	(working copy)
 | 
| @@ -87,10 +87,10 @@
 | 
|  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).
 | 
| @@ -186,7 +186,7 @@
 | 
|  }
 | 
|  
 | 
|  AutocompletePopupViewWin::AutocompletePopupViewWin(
 | 
| -    const ChromeFont& font,
 | 
| +    const gfx::Font& font,
 | 
|      AutocompleteEditViewWin* edit_view,
 | 
|      AutocompleteEditModel* edit_model,
 | 
|      Profile* profile)
 | 
| @@ -680,7 +680,7 @@
 | 
|  
 | 
|  // static
 | 
|  AutocompletePopupView* AutocompletePopupView::CreatePopupView(
 | 
| -    const ChromeFont& font,
 | 
| +    const gfx::Font& font,
 | 
|      AutocompleteEditViewWin* edit_view,
 | 
|      AutocompleteEditModel* edit_model,
 | 
|      Profile* profile,
 | 
| 
 |