Refactor: Makes menus use gfx::FontList instead of gfx::Font.

chrome/browser/ui/views/toolbar/wrench_menu.cc

 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 388 matching lines @@
     MenuButtonBackground* bg =
         new MenuButtonBackground(type, menu_->use_new_menu());
     button->set_background(bg);
     const MenuConfig& menu_config = menu_->GetMenuConfig();
     button->SetTextColor(views::Button::STATE_NORMAL, menu_config.text_color);
     if (background)
       *background = bg;
     button->set_border(
         new MenuButtonBorder(menu_config, menu_->use_new_menu()));
     button->SetHorizontalAlignment(gfx::ALIGN_CENTER);
-    button->SetFontList(gfx::FontList(menu_config.font));
+    button->SetFontList(menu_config.font_list);
     ui::NativeTheme* native_theme = button->GetNativeTheme();
     button->SetTextColor(
         views::Button::STATE_DISABLED,
         native_theme->GetSystemColor(
             ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor));
     button->SetTextColor(
         views::Button::STATE_HOVERED,
         native_theme->GetSystemColor(
             ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor));
     button->SetTextColor(
@@ skipping 200 matching lines @@
 
     MenuButtonBackground* center_bg = new MenuButtonBackground(
         menu->use_new_menu() && menu->supports_new_separators_ ?
             MenuButtonBackground::RIGHT_BUTTON :
             MenuButtonBackground::CENTER_BUTTON,
         menu->use_new_menu());
     zoom_label_->set_background(center_bg);
     const MenuConfig& menu_config(menu->GetMenuConfig());
     zoom_label_->set_border(
         new MenuButtonBorder(menu_config, menu->use_new_menu()));
-    zoom_label_->SetFontList(gfx::FontList(menu_config.font));
+    zoom_label_->SetFontList(menu_config.font_list);
 
     AddChildView(zoom_label_);
     zoom_label_width_ = MaxWidthForZoomLabel();
 
     increment_button_ = CreateButtonWithAccName(
         IDS_ZOOM_PLUS2, MenuButtonBackground::RIGHT_BUTTON, increment_index,
         NULL, IDS_ACCNAME_ZOOM_PLUS2);
 
     center_bg->SetOtherButtons(decrement_button_, increment_button_);
 
@@ skipping 197 matching lines @@
   // Return the specific menu width of recent tabs submenu if |menu| is the
   // recent tabs submenu, else return -1.
   int GetMaxWidthForMenu(views::MenuItemView* menu) {
     if (!menu_item_->HasSubmenu())
       return -1;
     const int kMaxMenuItemWidth = 320;
     return menu->GetCommand() == menu_item_->GetCommand() ?
         kMaxMenuItemWidth : -1;
   }
 
-  const gfx::Font* GetLabelFontAt(int index) const {
-    return model_->GetLabelFontAt(index);
+  const gfx::FontList* GetLabelFontListAt(int index) const {
+    return model_->GetLabelFontListAt(index);
   }
 
   bool GetForegroundColorAt(int index,
                             bool is_hovered,
                             SkColor* override_color) const {
-    // The items for which we get a font, should be shown in black.
-    if (GetLabelFontAt(index)) {
+    // The items for which we get a font list, should be shown in black.
+    if (GetLabelFontListAt(index)) {
       *override_color = SK_ColorBLACK;
       return true;
     }
     return false;
   }
 
   // ui::MenuModelDelegate implementation:
 
   virtual void OnIconChanged(int index) OVERRIDE {
     int command_id = model_->GetCommandIdAt(index);
@@ skipping 122 matching lines @@
 }
 
 void WrenchMenu::AddObserver(WrenchMenuObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void WrenchMenu::RemoveObserver(WrenchMenuObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
-const gfx::Font* WrenchMenu::GetLabelFont(int command_id) const {
+const gfx::FontList* WrenchMenu::GetLabelFontList(int command_id) const {
   if (IsRecentTabsCommand(command_id)) {
-    return recent_tabs_menu_model_delegate_->GetLabelFontAt(
+    return recent_tabs_menu_model_delegate_->GetLabelFontListAt(
         ModelIndexFromCommandId(command_id));
   }
   return NULL;
 }
 
 bool WrenchMenu::GetForegroundColor(int command_id,
                                     bool is_hovered,
                                     SkColor* override_color) const {
   if (IsRecentTabsCommand(command_id)) {
     return recent_tabs_menu_model_delegate_->GetForegroundColorAt(
@@ skipping 349 matching lines @@
                                 0,
                                 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
                                 BOOKMARK_LAUNCH_LOCATION_WRENCH_MENU);
 }
 
 int WrenchMenu::ModelIndexFromCommandId(int command_id) const {
   CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id);
   DCHECK(ix != command_id_to_entry_.end());
   return ix->second.second;
 }