Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(799)

Unified Diff: views/controls/menu/menu_win.cc

Issue 113441: ChromeFont->gfx::Font... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/menu/chrome_menu.cc ('k') | views/controls/text_field.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_win.cc
===================================================================
--- views/controls/menu/menu_win.cc (revision 16106)
+++ views/controls/menu/menu_win.cc (working copy)
@@ -107,7 +107,7 @@
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);
@@ -161,7 +161,7 @@
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();
« no previous file with comments | « views/controls/menu/chrome_menu.cc ('k') | views/controls/text_field.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698