ui/display/manager/display_layout.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/display/manager/display_layout.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/display/manager/display_layout.cc

diff --git a/ui/display/manager/display_layout.cc b/ui/display/manager/display_layout.cc

index 285456e9fa27a00df7e8f3fbd40d2fcd0c73fcce..203345157a6f3cc4ec0af11e382b264c8a1fa980 100644

--- a/ui/display/manager/display_layout.cc

+++ b/ui/display/manager/display_layout.cc

@@ -231,8 +231,8 @@ bool DisplayLayout::Validate(const DisplayIdList& list,

return has_primary_as_parent;

}

-scoped_ptr<DisplayLayout> DisplayLayout::Copy() const {

- scoped_ptr<DisplayLayout> copy(new DisplayLayout);

+std::unique_ptr<DisplayLayout> DisplayLayout::Copy() const {

+ std::unique_ptr<DisplayLayout> copy(new DisplayLayout);

for (const auto& placement : placement_list)

copy->placement_list.push_back(placement);

copy->mirrored = mirrored;

« no previous file with comments | « ui/display/manager/display_layout.h ('k') | ui/display/manager/display_layout_builder.h » ('j') | no next file with comments »