Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: ui/gl/gl_surface_egl.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/gl/gl_image_shared_memory.cc ('k') | ui/gl/gl_surface_egl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_egl.h
diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h
index 97f2b15384e4e6dd955559e36d17919972af6293..373c655ec1ede88218ed06e38c5407a557a4de13 100644
--- a/ui/gl/gl_surface_egl.h
+++ b/ui/gl/gl_surface_egl.h
@@ -9,12 +9,12 @@
#include <windows.h>
#endif
+#include <memory>
#include <string>
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "ui/gfx/geometry/size.h"
@@ -112,7 +112,7 @@ class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL {
// Create a NativeViewGLSurfaceEGL with an externally provided VSyncProvider.
// Takes ownership of the VSyncProvider.
- virtual bool Initialize(scoped_ptr<VSyncProvider> sync_provider);
+ virtual bool Initialize(std::unique_ptr<VSyncProvider> sync_provider);
// Takes care of the platform dependant bits, of any, for creating the window.
virtual bool InitializeNativeWindow();
@@ -135,7 +135,7 @@ class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL {
bool supports_post_sub_buffer_;
bool flips_vertically_;
- scoped_ptr<VSyncProvider> vsync_provider_;
+ std::unique_ptr<VSyncProvider> vsync_provider_;
int swap_interval_;
« no previous file with comments | « ui/gl/gl_image_shared_memory.cc ('k') | ui/gl/gl_surface_egl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698