ui/gfx/x/x11_types.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/gfx/x/x11_types.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/gfx/x/x11_types.h

diff --git a/ui/gfx/x/x11_types.h b/ui/gfx/x/x11_types.h

index 2b00a2150d8048577475e275da7dff78a4237ab6..e4ecffcb81877a1cacab34496a2226deb931a847 100644

--- a/ui/gfx/x/x11_types.h

+++ b/ui/gfx/x/x11_types.h

@@ -7,7 +7,8 @@

#include <stdint.h>

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

+#include <memory>

#include "ui/gfx/gfx_export.h"

typedef unsigned long XAtom;

@@ -31,7 +32,7 @@ struct XObjectDeleter {

};

template <class T, class D = XObjectDeleter<void, int, XFree>>

-using XScopedPtr = scoped_ptr<T, D>;

+using XScopedPtr = std::unique_ptr<T, D>;

// TODO(oshima|evan): This assume there is one display and doesn't work

// undef multiple displays/monitor environment. Remove this and change the

« no previous file with comments | « ui/gfx/x/x11_atom_cache.cc ('k') | ui/gl/egl_api_unittest.cc » ('j') | no next file with comments »