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

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

Index: chrome/browser/ui/views/toolbar/wrench_menu.cc
diff --git a/chrome/browser/ui/views/toolbar/wrench_menu.cc b/chrome/browser/ui/views/toolbar/wrench_menu.cc
index 3bac99e814b607ac663dc0ea84712cc1613637c0..716604643d775e32c7bc3e1bf8d23ff8371d472b 100644
--- a/chrome/browser/ui/views/toolbar/wrench_menu.cc
+++ b/chrome/browser/ui/views/toolbar/wrench_menu.cc
@@ -406,7 +406,7 @@ class WrenchMenuView : public views::View,
     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,
@@ -627,7 +627,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView {
     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();
@@ -845,15 +845,15 @@ class WrenchMenu::RecentTabsMenuModelDelegate : public ui::MenuModelDelegate {
         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;
     }
@@ -996,9 +996,9 @@ 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;