views/controls/menu/menu_item_view.cc - Issue 7067032: Add MenuModelAdapter to wrap ui::MenuModel with views::MenuDelegate interface.

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_item_view.cc

Issue 7067032: Add MenuModelAdapter to wrap ui::MenuModel with views::MenuDelegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Restore NOTREACHED() in IsCommandEnabled(). Created 9 years, 7 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: views/controls/menu/menu_item_view.cc

diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc

index a914f4020a22bf0c9cfbe10ff6be8aef88f93998..bf63846d20c00c9cd38c5fc2e529a433d0ae665c 100644

--- a/views/controls/menu/menu_item_view.cc

+++ b/views/controls/menu/menu_item_view.cc

@@ -563,7 +563,7 @@ void MenuItemView::Init(MenuItemView* parent,

has_icons_ = false;

MenuDelegate* root_delegate = GetDelegate();

- if (root_delegate)

+ if (parent && root_delegate)

sky 2011/05/25 15:41:12 Yes, this is a good change. I just did one similar

rhashimoto 2011/05/25 16:24:37 Done.

SetEnabled(root_delegate->IsCommandEnabled(command));

}

« ui/base/models/menu_model.cc ('K') | « ui/base/models/menu_model.cc ('k') | views/controls/menu/menu_model_adapter.h » ('j') | views/controls/menu/menu_model_adapter.h » ('J')