ash/shelf/shelf_view.cc - Issue 486193004: Ash: Fix browser icon menu model lifetime

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: ash/shelf/shelf_view.cc

Issue 486193004: Ash: Fix browser icon menu model lifetime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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: ash/shelf/shelf_view.cc

diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc

index 5e4f00255c028296401e34233c241e8af1e0803f..60267d9c189d69761fca75872ff6b0cdea7ac8d6 100644

--- a/ash/shelf/shelf_view.cc

+++ b/ash/shelf/shelf_view.cc

@@ -1719,8 +1719,10 @@ bool ShelfView::ShowListMenuForView(const ShelfItem& item,

// Make sure we have a menu and it has at least two items in addition to the

// application title and the 3 spacing separators.

- if (!list_menu_model_.get() || list_menu_model_->GetItemCount() <= 5)

+ if (!list_menu_model_.get() || list_menu_model_->GetItemCount() <= 5) {

+ list_menu_model_.reset();

return false;

+ }

ShowMenu(list_menu_model_.get(),

source,

« no previous file with comments | « ash/shelf/shelf_view.h ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »