ui/ozone/common/native_display_delegate_ozone.cc - Issue 1438343002: Remove deprecated ScopedVector usage from ui/ozone and ui/events/ozone

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/ozone/common/native_display_delegate_ozone.cc

Issue 1438343002: Remove deprecated ScopedVector usage from ui/ozone and ui/events/ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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

« ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc ('K') | « ui/ozone/common/native_display_delegate_ozone.h ('k') | ui/ozone/demo/ozone_demo.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/ozone/common/native_display_delegate_ozone.cc

diff --git a/ui/ozone/common/native_display_delegate_ozone.cc b/ui/ozone/common/native_display_delegate_ozone.cc

index a7f7d1f900fb0bb1d519ff740f71863e23d67b2a..7dd50377714519806eb59c699094fd5babcd3708 100644

--- a/ui/ozone/common/native_display_delegate_ozone.cc

+++ b/ui/ozone/common/native_display_delegate_ozone.cc

@@ -20,7 +20,7 @@ void NativeDisplayDelegateOzone::Initialize() {

DisplaySnapshot_Params params;

if (CreateSnapshotFromCommandLine(&params)) {

DCHECK_NE(DISPLAY_CONNECTION_TYPE_NONE, params.type);

- displays_.push_back(new DisplaySnapshotProxy(params));

+ displays_.push_back(make_scoped_ptr(new DisplaySnapshotProxy(params)));

}

@@ -58,7 +58,10 @@ void NativeDisplayDelegateOzone::ForceDPMSOn() {

void NativeDisplayDelegateOzone::GetDisplays(

const GetDisplaysCallback& callback) {

- callback.Run(displays_.get());

+ std::vector<DisplaySnapshot*> displays;

+ for (const auto& display : displays_)

+ displays.push_back(display.get());

+ callback.Run(displays);

}

void NativeDisplayDelegateOzone::AddMode(const ui::DisplaySnapshot& output,