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

Unified Diff: ui/ozone/platform/cast/surface_factory_cast.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/platform/cast/ozone_platform_cast.cc ('k') | ui/ozone/platform/cast/surface_factory_cast.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/cast/surface_factory_cast.h
diff --git a/ui/ozone/platform/cast/surface_factory_cast.h b/ui/ozone/platform/cast/surface_factory_cast.h
index fd7ab824f39c2f05b35b89174b18029318f9c932..388f37ca1f1073758116c2c3d5f4b82434f7a9c6 100644
--- a/ui/ozone/platform/cast/surface_factory_cast.h
+++ b/ui/ozone/platform/cast/surface_factory_cast.h
@@ -7,8 +7,9 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
#include "ui/ozone/public/surface_factory_ozone.h"
@@ -24,14 +25,14 @@ class SurfaceFactoryCast : public SurfaceFactoryOzone {
public:
SurfaceFactoryCast();
explicit SurfaceFactoryCast(
- scoped_ptr<chromecast::CastEglPlatform> egl_platform);
+ std::unique_ptr<chromecast::CastEglPlatform> egl_platform);
~SurfaceFactoryCast() override;
// SurfaceFactoryOzone implementation:
- scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget(
+ std::unique_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget(
gfx::AcceleratedWidget widget) override;
intptr_t GetNativeDisplay() override;
- scoped_ptr<SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
+ std::unique_ptr<SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
gfx::AcceleratedWidget widget) override;
scoped_refptr<NativePixmap> CreateNativePixmap(
gfx::AcceleratedWidget widget,
@@ -66,7 +67,7 @@ class SurfaceFactoryCast : public SurfaceFactoryOzone {
void* window_;
gfx::Size display_size_;
gfx::Size new_display_size_;
- scoped_ptr<chromecast::CastEglPlatform> egl_platform_;
+ std::unique_ptr<chromecast::CastEglPlatform> egl_platform_;
// Overlays scheduled in current and previous frames:
int overlay_count_;
« no previous file with comments | « ui/ozone/platform/cast/ozone_platform_cast.cc ('k') | ui/ozone/platform/cast/surface_factory_cast.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698