ui/views/controls/button/button_dropdown.cc - Issue 10832184: Fixed memory leak. Untangled confusing code with menu initialization and ownership.

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/button/button_dropdown.cc

Issue 10832184: Fixed memory leak. Untangled confusing code with menu initialization and ownership. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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:

View side-by-side diff with in-line comments

Download patch

Index: ui/views/controls/button/button_dropdown.cc

===================================================================

--- ui/views/controls/button/button_dropdown.cc (revision 150365)

+++ ui/views/controls/button/button_dropdown.cc (working copy)

@@ -175,8 +175,8 @@

menu_showing_ = true;

// Create and run menu. Display an empty menu if model is NULL.

- if (model_) {

- MenuModelAdapter menu_delegate(model_);

+ if (model_.get()) {

+ MenuModelAdapter menu_delegate(model_.get());

menu_delegate.set_triggerable_event_flags(triggerable_event_flags());

menu_runner_.reset(new MenuRunner(menu_delegate.CreateMenu()));

MenuRunner::RunResult result =

« no previous file with comments | « ui/views/controls/button/button_dropdown.h ('k') | ui/views/view_unittest.cc » ('j') | no next file with comments »