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

Unified Diff: ui/ozone/public/surface_factory_ozone.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/ozone/public/ozone_platform.cc ('k') | ui/ozone/public/surface_factory_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/public/surface_factory_ozone.h
diff --git a/ui/ozone/public/surface_factory_ozone.h b/ui/ozone/public/surface_factory_ozone.h
index cebf49a48adb5d813d21469eeaf382b70c3720a1..dc3a07e2b6abdc0ea47dd6ccf4cc4505071f7252 100644
--- a/ui/ozone/public/surface_factory_ozone.h
+++ b/ui/ozone/public/surface_factory_ozone.h
@@ -6,11 +6,12 @@
#define UI_OZONE_PUBLIC_SURFACE_FACTORY_OZONE_H_
#include <stdint.h>
+
+#include <memory>
#include <vector>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/native_library.h"
#include "ui/gfx/buffer_types.h"
#include "ui/gfx/geometry/rect.h"
@@ -70,20 +71,20 @@ class OZONE_BASE_EXPORT SurfaceFactoryOzone {
// Note: When used from content, this is called in the GPU process. The
// platform must support creation of SurfaceOzoneEGL from the GPU process
// using only the handle contained in gfx::AcceleratedWidget.
- virtual scoped_ptr<SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
+ virtual std::unique_ptr<SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
gfx::AcceleratedWidget widget);
// Create an EGL surface that isn't backed by any buffers, and is used
// for overlay-only displays. This will return NULL if this mode is
// not supported.
- virtual scoped_ptr<SurfaceOzoneEGL> CreateSurfacelessEGLSurfaceForWidget(
+ virtual std::unique_ptr<SurfaceOzoneEGL> CreateSurfacelessEGLSurfaceForWidget(
gfx::AcceleratedWidget widget);
// Create SurfaceOzoneCanvas for the specified gfx::AcceleratedWidget.
//
// Note: The platform must support creation of SurfaceOzoneCanvas from the
// Browser Process using only the handle contained in gfx::AcceleratedWidget.
- virtual scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget(
+ virtual std::unique_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget(
gfx::AcceleratedWidget widget);
// Sets up GL bindings for the native surface. Takes two callback parameters
« no previous file with comments | « ui/ozone/public/ozone_platform.cc ('k') | ui/ozone/public/surface_factory_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698