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

Unified Diff: ui/ozone/platform/headless/headless_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
Index: ui/ozone/platform/headless/headless_surface_factory.cc
diff --git a/ui/ozone/platform/headless/headless_surface_factory.cc b/ui/ozone/platform/headless/headless_surface_factory.cc
index a8b9952501322cf2157d5898e715695cf6ae93ee..44b3435a5d72c18f5c86abefbb70e55ca0957fe6 100644
--- a/ui/ozone/platform/headless/headless_surface_factory.cc
+++ b/ui/ozone/platform/headless/headless_surface_factory.cc
@@ -8,6 +8,7 @@
#include "base/files/file_util.h"
#include "base/location.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/threading/worker_pool.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkSurface.h"
@@ -56,7 +57,7 @@ class FileSurface : public SurfaceOzoneCanvas {
FROM_HERE, base::Bind(&WriteDataToFile, location_, bitmap), true);
}
}
- scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override {
+ std::unique_ptr<gfx::VSyncProvider> CreateVSyncProvider() override {
return nullptr;
}
@@ -106,10 +107,10 @@ HeadlessSurfaceFactory::HeadlessSurfaceFactory(
HeadlessSurfaceFactory::~HeadlessSurfaceFactory() {}
-scoped_ptr<SurfaceOzoneCanvas> HeadlessSurfaceFactory::CreateCanvasForWidget(
- gfx::AcceleratedWidget widget) {
+std::unique_ptr<SurfaceOzoneCanvas>
+HeadlessSurfaceFactory::CreateCanvasForWidget(gfx::AcceleratedWidget widget) {
HeadlessWindow* window = window_manager_->GetWindow(widget);
- return make_scoped_ptr<SurfaceOzoneCanvas>(new FileSurface(window->path()));
+ return base::WrapUnique<SurfaceOzoneCanvas>(new FileSurface(window->path()));
}
bool HeadlessSurfaceFactory::LoadEGLGLES2Bindings(
« no previous file with comments | « ui/ozone/platform/headless/headless_surface_factory.h ('k') | ui/ozone/platform/headless/headless_window_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698