ui/views/controls/menu/menu_item_view.cc - Issue 14161006: Fix NOTREACHED triggered by MenuItemView::GetAcceleratorText

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

Issue 14161006: Fix NOTREACHED triggered by MenuItemView::GetAcceleratorText (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 8 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_item_view.cc

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

index 9093fa7af94cf15cb0c3aa6b9a80f60fa5a249e6..2a603af7cc43420ed3607b36360fc9fa9176fbbb 100644

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

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

@@ -1009,7 +1009,7 @@ string16 MenuItemView::GetAcceleratorText() {

return string16();

ui::Accelerator accelerator;

- return (GetDelegate() &&

+ return (GetDelegate() && GetCommand() &&

GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?

accelerator.GetShortcutText() : string16();

}

« no previous file with comments | « no previous file | no next file » | no next file with comments »