| Index: chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
|
| index 5076cc4717986a9252cf225df639374216e92483..d40fab6c7cea5fbd9b5eabc82052393777e33636 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
|
| @@ -16,7 +16,7 @@
|
| #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"
|
|
|
| @@ -96,10 +96,9 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) {
|
| }
|
| 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)));
|
|
|