ui/views/controls/menu/menu_item_view.cc - Issue 2690013002: Revert of Stop MenuItemView From Directly Caching MenuController

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 2690013002: Revert of Stop MenuItemView From Directly Caching MenuController (Closed)

Patch Set: Created 3 years, 10 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 9f16f80694dbdcbf553bbaa5415e21c35ec8eed1..4b2efb01ce99a691e7e489c6f75e835b4178704d 100644

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

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

@@ -435,11 +435,11 @@

}

MenuController* MenuItemView::GetMenuController() {

- return GetRootMenuItem()->controller_.get();

+ return GetRootMenuItem()->controller_;

}

const MenuController* MenuItemView::GetMenuController() const {

- return GetRootMenuItem()->controller_.get();

+ return GetRootMenuItem()->controller_;

}

MenuDelegate* MenuItemView::GetDelegate() {

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