ChromeFont->gfx::Font...

views/controls/menu/menu_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 "views/controls/menu/menu_win.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlwin.h>
 #include <atlcrack.h>
@@ skipping 89 matching lines @@
   void OnRButtonUp(UINT w_param, const CPoint& loc) {
     int id;
     if (menu_->delegate() && FindMenuIDByLocation(menu_, loc, &id))
       menu_->delegate()->ShowContextMenu(menu_, id, loc.x, loc.y, true);
   }
 
   void OnMeasureItem(WPARAM w_param, MEASUREITEMSTRUCT* lpmis) {
     MenuWin::ItemData* data =
         reinterpret_cast<MenuWin::ItemData*>(lpmis->itemData);
     if (data != NULL) {
-      ChromeFont font;
+      gfx::Font font;
       lpmis->itemWidth = font.GetStringWidth(data->label) + kIconWidth +
           kItemLeftMargin + kItemRightMargin -
           GetSystemMetrics(SM_CXMENUCHECK);
       if (data->submenu)
         lpmis->itemWidth += kArrowWidth;
       // If the label contains an accelerator, make room for tab.
       if (data->label.find(L'\t') != std::wstring::npos)
         lpmis->itemWidth += font.GetStringWidth(L" ");
       lpmis->itemHeight = font.height() + kItemBottomMargin + kItemTopMargin;
     } else {
@@ skipping 33 matching lines @@
       rect.top += kItemTopMargin;
       // Should we add kIconWidth only when icon.width() != 0 ?
       rect.left += kItemLeftMargin + kIconWidth;
       rect.right -= kItemRightMargin;
       UINT format = DT_TOP | DT_SINGLELINE;
       // Check whether the mnemonics should be underlined.
       BOOL underline_mnemonics;
       SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &underline_mnemonics, 0);
       if (!underline_mnemonics)
         format |= DT_HIDEPREFIX;
-      ChromeFont font;
+      gfx::Font font;
       HGDIOBJ old_font = static_cast<HFONT>(SelectObject(hDC, font.hfont()));
       int fontsize = font.FontSize();
 
       // If an accelerator is specified (with a tab delimiting the rest of the
       // label from the accelerator), we have to justify the fist part on the
       // left and the accelerator on the right.
       // TODO(jungshik): This will break in RTL UI. Currently, he/ar use the
       //                 window system UI font and will not hit here.
       std::wstring label = data->label;
       std::wstring accel;
@@ skipping 381 matching lines @@
       break;
 
     default:
       NOTREACHED();
       return 0;
   }
   return align_flags;
 }
 
 }  // namespace views