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

chrome/browser/ui/webui/chromeos/login/network_dropdown.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/ui/webui/chromeos/login/network_dropdown.h"
 
 #include <string>
 
 #include "ash/system/chromeos/network/network_icon.h"
 #include "ash/system/chromeos/network/network_icon_animation.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chromeos/network/network_state_handler.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/webui/web_ui_util.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 // Timeout between consecutive requests to network library for network
 // scan.
 const int kNetworkScanIntervalSecs = 60;
 
 }  // namespace
@@ skipping 59 matching lines @@
     item->SetString("label", model->GetLabelAt(i));
     gfx::Image icon;
     if (model->GetIconAt(i, &icon)) {
       SkBitmap icon_bitmap = icon.ToImageSkia()->GetRepresentation(
           ui::GetImageScale(
               web_ui_->GetDeviceScaleFactor())).sk_bitmap();
       item->SetString("icon", webui::GetBitmapDataUrl(icon_bitmap));
     }
     if (id >= 0) {
       item->SetBoolean("enabled", model->IsEnabledAt(i));
-      const gfx::Font* font = model->GetLabelFontAt(i);
-      if (font) {
-        item->SetBoolean("bold", font->GetStyle() == gfx::Font::BOLD);
-      }
+      const gfx::FontList* font_list = model->GetLabelFontListAt(i);
+      if (font_list)
+        item->SetBoolean("bold", font_list->GetFontStyle() == gfx::Font::BOLD);
     }
     if (type == ui::MenuModel::TYPE_SUBMENU)
       item->Set("sub", ConvertMenuModel(model->GetSubmenuModelAt(i)));
     list->Append(item);
   }
   return list;
 }
 
 // NetworkDropdown -------------------------------------------------------------
 
@@ skipping 89 matching lines @@
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
                                   title, icon);
 }
 
 void NetworkDropdown::RequestNetworkScan() {
   NetworkHandler::Get()->network_state_handler()->RequestScan();
   Refresh();
 }
 
 }  // namespace chromeos