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

chrome/browser/chromeos/status/network_menu.cc

 // Copyright (c) 2012 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/chromeos/status/network_menu.h"
 
 #include <algorithm>
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 106 matching lines @@
   const MenuItemVector& menu_items() const { return menu_items_; }
 
   // ui::MenuModel implementation
   // GetCommandIdAt() must be implemented by subclasses.
   virtual bool HasIcons() const OVERRIDE;
   virtual int GetItemCount() const OVERRIDE;
   virtual ui::MenuModel::ItemType GetTypeAt(int index) const OVERRIDE;
   virtual ui::MenuSeparatorType GetSeparatorTypeAt(int index) const OVERRIDE;
   virtual base::string16 GetLabelAt(int index) const OVERRIDE;
   virtual bool IsItemDynamicAt(int index) const OVERRIDE;
-  virtual const gfx::Font* GetLabelFontAt(int index) const OVERRIDE;
+  virtual const gfx::FontList* GetLabelFontListAt(int index) const OVERRIDE;
   virtual bool GetAcceleratorAt(int index,
                                 ui::Accelerator* accelerator) const OVERRIDE;
   virtual bool IsItemCheckedAt(int index) const OVERRIDE;
   virtual int GetGroupIdAt(int index) const OVERRIDE;
   virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE;
   virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(
       int index) const OVERRIDE;
   virtual bool IsEnabledAt(int index) const OVERRIDE;
   virtual bool IsVisibleAt(int index) const OVERRIDE;
   virtual ui::MenuModel* GetSubmenuModelAt(int index) const OVERRIDE;
@@ skipping 99 matching lines @@
 }
 
 base::string16 NetworkMenuModel::GetLabelAt(int index) const {
   return menu_items_[index].label;
 }
 
 bool NetworkMenuModel::IsItemDynamicAt(int index) const {
   return false;
 }
 
-const gfx::Font* NetworkMenuModel::GetLabelFontAt(int index) const {
-  const gfx::Font* font = NULL;
+const gfx::FontList* NetworkMenuModel::GetLabelFontListAt(int index) const {
+  const gfx::FontList* font_list = NULL;
   if (menu_items_[index].flags & FLAG_ASSOCIATED) {
-    ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance();
-    font = &resource_bundle.GetFont(
-        browser_defaults::kAssociatedNetworkFontStyle);
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    font_list = &rb.GetFontList(browser_defaults::kAssociatedNetworkFontStyle);
   }
 
-  return font;
+  return font_list;
 }
 
 bool NetworkMenuModel::GetAcceleratorAt(int index,
                                         ui::Accelerator* accelerator) const {
   return false;
 }
 
 bool NetworkMenuModel::IsItemCheckedAt(int index) const {
   // All ui::MenuModel::TYPE_CHECK menu items are checked.
   return true;
@@ skipping 408 matching lines @@
   return main_menu_model_.get();
 }
 
 void NetworkMenu::UpdateMenu() {
   refreshing_menu_ = true;
   main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions());
   refreshing_menu_ = false;
 }
 
 }  // namespace chromeos