Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(860)

Unified Diff: ui/base/cocoa/menu_controller.mm

Issue 117903006: Refactor: Makes menus use gfx::FontList instead of gfx::Font. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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]

Powered by Google App Engine
This is Rietveld 408576698