| Index: ui/base/cocoa/menu_controller.mm
|
| diff --git a/ui/base/cocoa/menu_controller.mm b/ui/base/cocoa/menu_controller.mm
|
| index 8f03d0fc9a96855f42841b5f92eb6d6050ea5ee9..ad3ada556cfedc14159462110db67e0a8db0122e 100644
|
| --- a/ui/base/cocoa/menu_controller.mm
|
| +++ b/ui/base/cocoa/menu_controller.mm
|
| @@ -179,10 +179,11 @@
|
| model->GetIconAt(modelIndex, &icon);
|
| [(id)item setImage:icon.IsEmpty() ? nil : icon.ToNSImage()];
|
| }
|
| - const gfx::Font* font = model->GetLabelFontAt(modelIndex);
|
| - if (font) {
|
| + const gfx::FontList* font_list = model->GetLabelFontListAt(modelIndex);
|
| + if (font_list) {
|
| NSDictionary *attributes =
|
| - [NSDictionary dictionaryWithObject:font->GetNativeFont()
|
| + [NSDictionary dictionaryWithObject:font_list->GetPrimaryFont().
|
| + GetNativeFont()
|
| forKey:NSFontAttributeName];
|
| base::scoped_nsobject<NSAttributedString> title(
|
| [[NSAttributedString alloc] initWithString:[(id)item title]
|
|
|