ui/gl/gl_image_shared_memory.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/gl/gl_image_shared_memory.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/gl/gl_image_shared_memory.h

diff --git a/ui/gl/gl_image_shared_memory.h b/ui/gl/gl_image_shared_memory.h

index 179011d6b4937b8d5a5b87d0b4fb6a259fa51ff3..b1f5f99482cce9dcabd79eeb294b3dfd5572f9ba 100644

--- a/ui/gl/gl_image_shared_memory.h

+++ b/ui/gl/gl_image_shared_memory.h

@@ -8,8 +8,9 @@

#include <stddef.h>

#include <stdint.h>

+#include <memory>

#include "base/macros.h"

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

#include "base/memory/shared_memory_handle.h"

#include "ui/gfx/generic_shared_memory_id.h"

#include "ui/gl/gl_image_memory.h"

@@ -40,7 +41,7 @@ class GL_EXPORT GLImageSharedMemory : public GLImageMemory {

~GLImageSharedMemory() override;

private:

- scoped_ptr<base::SharedMemory> shared_memory_;

+ std::unique_ptr<base::SharedMemory> shared_memory_;

gfx::GenericSharedMemoryId shared_memory_id_;

DISALLOW_COPY_AND_ASSIGN(GLImageSharedMemory);

« no previous file with comments | « ui/gl/gl_image_memory.cc ('k') | ui/gl/gl_image_shared_memory.cc » ('j') | no next file with comments »