| Index: ui/views/controls/menu/menu_model_adapter.cc
|
| diff --git a/ui/views/controls/menu/menu_model_adapter.cc b/ui/views/controls/menu/menu_model_adapter.cc
|
| index 6b29e7e0b059c94eb8c610a5509cfb05a59a0c64..fb6ea6a8bc2af439e41a12ba072d999c18dd3179 100644
|
| --- a/ui/views/controls/menu/menu_model_adapter.cc
|
| +++ b/ui/views/controls/menu/menu_model_adapter.cc
|
| @@ -181,17 +181,17 @@ base::string16 MenuModelAdapter::GetLabel(int id) const {
|
| return base::string16();
|
| }
|
|
|
| -const gfx::Font* MenuModelAdapter::GetLabelFont(int id) const {
|
| +const gfx::FontList* MenuModelAdapter::GetLabelFontList(int id) const {
|
| ui::MenuModel* model = menu_model_;
|
| int index = 0;
|
| if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) {
|
| - const gfx::Font* font = model->GetLabelFontAt(index);
|
| - if (font)
|
| - return font;
|
| + const gfx::FontList* font_list = model->GetLabelFontListAt(index);
|
| + if (font_list)
|
| + return font_list;
|
| }
|
|
|
| // This line may be reached for the empty menu item.
|
| - return MenuDelegate::GetLabelFont(id);
|
| + return MenuDelegate::GetLabelFontList(id);
|
| }
|
|
|
| bool MenuModelAdapter::IsCommandEnabled(int id) const {
|
|
|