views/controls/menu/menu_model_adapter.h - Issue 8508055: Move views::Accelerator to ui in order to use it from aura code.

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: views/controls/menu/menu_model_adapter.h

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase Created 9 years, 1 month 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: views/controls/menu/menu_model_adapter.h

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

index a85ad9f8da52335802c88e4bf922b940f672f012..8df4eefe2e360a88e516c1c84c6b3dfdc15d7870 100644

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

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

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

virtual bool IsTriggerableEvent(MenuItemView* source,

const MouseEvent& e) OVERRIDE;

virtual bool GetAccelerator(int id,

- views::Accelerator* accelerator) OVERRIDE;

+ ui::Accelerator* accelerator) OVERRIDE;

virtual string16 GetLabel(int id) const OVERRIDE;

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

virtual bool IsCommandEnabled(int id) const OVERRIDE;

« no previous file with comments | « views/controls/menu/menu_item_view.cc ('k') | views/controls/menu/menu_model_adapter.cc » ('j') | no next file with comments »