ui/views/controls/menu/menu_runner_impl.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

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_runner_impl.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 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:

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

Download patch

Index: ui/views/controls/menu/menu_runner_impl.h

diff --git a/ui/views/controls/menu/menu_runner_impl.h b/ui/views/controls/menu/menu_runner_impl.h

index cf31f8156e626fc4e489bf748aceb990a8da3b0c..7d0afa67bc58722c8ea83727ab87ed77a1f4f306 100644

--- a/ui/views/controls/menu/menu_runner_impl.h

+++ b/ui/views/controls/menu/menu_runner_impl.h

@@ -69,7 +69,7 @@ class MenuRunnerImpl : public MenuRunnerImplInterface,

// invoked. This is done to make sure the delegate isn't notified after

// Release() is invoked. We do this as we assume the delegate is no longer

// valid if MenuRunner has been deleted.

- scoped_ptr<MenuDelegate> empty_delegate_;

+ std::unique_ptr<MenuDelegate> empty_delegate_;

// Are we in run waiting for it to return?

bool running_;

« no previous file with comments | « ui/views/controls/menu/menu_runner_cocoa_unittest.mm ('k') | ui/views/controls/menu/menu_runner_impl_adapter.h » ('j') | no next file with comments »