ChromeFont->gfx::Font...

views/controls/menu/chrome_menu.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/chrome_menu.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
 
@@ skipping 108 matching lines @@
 // Are mnemonics shown? This is updated before the menus are shown.
 static bool show_mnemonics;
 
 using gfx::NativeTheme;
 
 namespace views {
 
 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.
 //
 // This is invoked prior to Running a menu.
 void UpdateMenuPartSizes(bool has_icons) {
   HDC dc = GetDC(NULL);
   RECT bounds = { 0, 0, 200, 200 };
   SIZE check_size;
   if (NativeTheme::instance()->GetThemePartSize(
@@ skipping 1061 matching lines @@
 void MenuItemView::SetIcon(const SkBitmap& icon) {
   icon_ = icon;
   SchedulePaint();
 }
 
 void MenuItemView::Paint(ChromeCanvas* canvas) {
   Paint(canvas, false);
 }
 
 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());
 }
 
 MenuController* MenuItemView::GetMenuController() {
   return GetRootMenuItem()->controller_;
 }
 
 MenuDelegate* MenuItemView::GetDelegate() {
@@ skipping 251 matching lines @@
 
   // Render the foreground.
   // Menu color is specific to Vista, fallback to classic colors if can't
   // get color.
   int default_sys_color = render_selection ? COLOR_HIGHLIGHTTEXT :
       (IsEnabled() ? COLOR_MENUTEXT : COLOR_GRAYTEXT);
   SkColor fg_color = NativeTheme::instance()->GetThemeColorWithDefault(
       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) {
     // With different themes, it's difficult to tell what the correct foreground
     // and background colors are for the text to draw the correct halo. Instead,
     // just draw black on white, which will look good in most cases.
     canvas->DrawStringWithHalo(GetTitle(), font, 0x00000000, 0xFFFFFFFF,
                                text_bounds.x(), text_bounds.y(),
                                text_bounds.width(), text_bounds.height(),
                                GetRootMenuItem()->GetDrawStringFlags());
@@ skipping 1310 matching lines @@
   if (!scroll_task_.get())
     scroll_task_.reset(new MenuScrollTask());
   scroll_task_->Update(part);
 }
 
 void MenuController::StopScrolling() {
   scroll_task_.reset(NULL);
 }
 
 }  // namespace views