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

« no previous file with comments | « ui/display/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc ('k') | ui/display/manager/display_layout.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/display/manager/display_layout.h

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

index aa5c134ccc5e5de998d4c0e688a08bc89dfe6ace..9edbf05b8b3be7798ad342e10332fcfc0a6706da 100644

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

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

@@ -7,11 +7,11 @@

#include <stdint.h>

+#include <memory>

#include <string>

#include <vector>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/strings/string_piece.h"

#include "ui/display/display_export.h"

@@ -100,7 +100,7 @@ class DISPLAY_EXPORT DisplayLayout final {

// The id of the display used as a primary display.

int64_t primary_id;

- scoped_ptr<DisplayLayout> Copy() const;

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

// Test if the |layout| has the same placement list. Other fields such

// as mirrored, primary_id are ignored.

« no previous file with comments | « ui/display/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc ('k') | ui/display/manager/display_layout.cc » ('j') | no next file with comments »