summaryrefslogtreecommitdiffstats
path: root/ui/base/cocoa
diff options
context:
space:
mode:
authoryukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 07:20:05 +0000
committeryukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 07:20:05 +0000
commitad8d9d577af1a4cb79c7dbbf4b57b1156a6f0143 (patch)
tree4667e32b426f21c4c7d5c6364a94e2f0ce33da29 /ui/base/cocoa
parent103ff3515ea4c37d7924fca6fee61d83da8d2744 (diff)
downloadchromium_src-ad8d9d577af1a4cb79c7dbbf4b57b1156a6f0143.zip
chromium_src-ad8d9d577af1a4cb79c7dbbf4b57b1156a6f0143.tar.gz
chromium_src-ad8d9d577af1a4cb79c7dbbf4b57b1156a6f0143.tar.bz2
Supports gfx::FontList in gfx::Canvas and ui::ElideText family.
This is a part of the plan to support gfx::FontList in views::Label. https://docs.google.com/a/chromium.org/document/d/1D_25fp9B8b9aZJORfAjDIFq61NWvUquZ5xmKH-VcC4k/edit BUG=265485 Review URL: https://chromiumcodereview.appspot.com/22835002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/cocoa')
-rw-r--r--ui/base/cocoa/menu_controller.mm1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/base/cocoa/menu_controller.mm b/ui/base/cocoa/menu_controller.mm
index 11792849..ebec346 100644
--- a/ui/base/cocoa/menu_controller.mm
+++ b/ui/base/cocoa/menu_controller.mm
@@ -12,6 +12,7 @@
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/models/simple_menu_model.h"
#include "ui/base/text/text_elider.h"
+#include "ui/gfx/font.h"
#include "ui/gfx/image/image.h"
@interface MenuController (Private)