ui/views/controls/menu/menu_controller.cc - 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_controller.cc

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

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

index c8166a5b590809021ddb264b99d3a362e6494844..2e74e19497c05c4f3142b5c5a3d9376562cd2469 100644

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

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

@@ -1185,7 +1185,7 @@ void MenuController::StartDrag(SubmenuView* source,

View::ConvertPointFromScreen(item, &press_loc);

gfx::Point widget_loc(press_loc);

View::ConvertPointToWidget(item, &widget_loc);

- scoped_ptr<gfx::Canvas> canvas(GetCanvasForDragImage(

+ std::unique_ptr<gfx::Canvas> canvas(GetCanvasForDragImage(

source->GetWidget(), gfx::Size(item->width(), item->height())));

item->PaintButton(canvas.get(), MenuItemView::PB_FOR_DRAG);

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