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

Unified Diff: ui/ozone/platform/x11/x11_surface_factory.cc

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/ozone/platform/x11/x11_surface_factory.h ('k') | ui/ozone/platform_constructor_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/x11/x11_surface_factory.cc
diff --git a/ui/ozone/platform/x11/x11_surface_factory.cc b/ui/ozone/platform/x11/x11_surface_factory.cc
index 4e96c9b48d331fc1a3abdffd98f18484f82af735..7dcc6dbccb10c1cb84ec24d9e94173b0ed449234 100644
--- a/ui/ozone/platform/x11/x11_surface_factory.cc
+++ b/ui/ozone/platform/x11/x11_surface_factory.cc
@@ -7,6 +7,7 @@
#include <X11/Xlib.h>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "third_party/khronos/EGL/egl.h"
#include "ui/gfx/vsync_provider.h"
#include "ui/gfx/x/x11_types.h"
@@ -34,7 +35,7 @@ class X11SurfaceEGL : public SurfaceOzoneEGL {
return true;
}
- scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override {
+ std::unique_ptr<gfx::VSyncProvider> CreateVSyncProvider() override {
return nullptr;
}
@@ -115,9 +116,9 @@ X11SurfaceFactory::X11SurfaceFactory() {}
X11SurfaceFactory::~X11SurfaceFactory() {}
-scoped_ptr<SurfaceOzoneEGL> X11SurfaceFactory::CreateEGLSurfaceForWidget(
+std::unique_ptr<SurfaceOzoneEGL> X11SurfaceFactory::CreateEGLSurfaceForWidget(
gfx::AcceleratedWidget widget) {
- return make_scoped_ptr(new X11SurfaceEGL(widget));
+ return base::WrapUnique(new X11SurfaceEGL(widget));
}
bool X11SurfaceFactory::LoadEGLGLES2Bindings(
« no previous file with comments | « ui/ozone/platform/x11/x11_surface_factory.h ('k') | ui/ozone/platform_constructor_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698