ChromeFont->gfx::Font...

views/controls/menu/chrome_menu.cc

Index: views/controls/menu/chrome_menu.cc
===================================================================
--- views/controls/menu/chrome_menu.cc	(revision 16106)
+++ views/controls/menu/chrome_menu.cc	(working copy)
@@ -126,14 +126,14 @@
 namespace {
 
 // Returns the font menus are to use.
-ChromeFont GetMenuFont() {
+gfx::Font GetMenuFont() {
   NONCLIENTMETRICS metrics;
   win_util::GetNonClientMetrics(&metrics);
 
   l10n_util::AdjustUIFont(&(metrics.lfMenuFont));
   HFONT font = CreateFontIndirect(&metrics.lfMenuFont);
   DLOG_ASSERT(font);
-  return ChromeFont::CreateFont(font);
+  return gfx::Font::CreateFont(font);
 }
 
 // Calculates all sizes that we can from the OS.
@@ -1215,7 +1215,7 @@
 }
 
 gfx::Size MenuItemView::GetPreferredSize() {
-  ChromeFont& font = GetRootMenuItem()->font_;
+  gfx::Font& font = GetRootMenuItem()->font_;
   return gfx::Size(
       font.GetStringWidth(title_) + label_start + item_right_margin,
       font.height() + GetBottomMargin() + GetTopMargin());
@@ -1487,7 +1487,7 @@
       NativeTheme::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR,
       default_sys_color);
   int width = this->width() - item_right_margin - label_start;
-  ChromeFont& font = GetRootMenuItem()->font_;
+  gfx::Font& font = GetRootMenuItem()->font_;
   gfx::Rect text_bounds(label_start, top_margin, width, font.height());
   text_bounds.set_x(MirroredLeftPointForRect(text_bounds));
   if (for_drag) {