ui/gl/gl_context_cgl.h - Issue 1917053003: unique_ptr_migration: clean up references to scoped_ptr as of r389721

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_context_cgl.h

Issue 1917053003: unique_ptr_migration: clean up references to scoped_ptr as of r389721 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . 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_context_cgl.h

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

index 1a1016268f3294979bc725c2474f23b21fafe0df..2bef70bf1381f351c93bac8dc56b70618d713316 100644

--- a/ui/gl/gl_context_cgl.h

+++ b/ui/gl/gl_context_cgl.h

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

#include <OpenGL/CGLTypes.h>

+#include <memory>

#include "base/macros.h"

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

#include "ui/gl/gl_context.h"

namespace gfx {

@@ -41,7 +42,7 @@ class GLContextCGL : public GLContextReal {

void* context_;

GpuPreference gpu_preference_;

- scoped_ptr<gl::YUVToRGBConverter> yuv_to_rgb_converter_;

+ std::unique_ptr<gl::YUVToRGBConverter> yuv_to_rgb_converter_;

CGLPixelFormatObj discrete_pixelformat_;

« no previous file with comments | « ui/android/window_android_compositor.h ('k') | ui/message_center/cocoa/popup_collection.h » ('j') | no next file with comments »