ui/views/controls/menu/menu_model_adapter.h - Issue 117903006: Refactor: Makes menus use gfx::FontList instead of gfx::Font.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/menu/menu_model_adapter.h

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:

Index: ui/views/controls/menu/menu_model_adapter.h

diff --git a/ui/views/controls/menu/menu_model_adapter.h b/ui/views/controls/menu/menu_model_adapter.h

index f8f6e1939632db6495b29e9f5c870373ae48aca5..644864d2de853383bafccbbdc152681ea6c1137b 100644

--- a/ui/views/controls/menu/menu_model_adapter.h

+++ b/ui/views/controls/menu/menu_model_adapter.h

@@ -69,7 +69,7 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate {

virtual bool GetAccelerator(int id,

ui::Accelerator* accelerator) OVERRIDE;

virtual base::string16 GetLabel(int id) const OVERRIDE;

- virtual const gfx::Font* GetLabelFont(int id) const OVERRIDE;

+ virtual const gfx::FontList* GetLabelFontList(int id) const OVERRIDE;

virtual bool IsCommandEnabled(int id) const OVERRIDE;

virtual bool IsItemChecked(int id) const OVERRIDE;

virtual void SelectionChanged(MenuItemView* menu) OVERRIDE;