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

Unified Diff: ui/ozone/platform/caca/caca_window_manager.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/caca/caca_window_manager.h ('k') | ui/ozone/platform/caca/ozone_platform_caca.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/caca/caca_window_manager.cc
diff --git a/ui/ozone/platform/caca/caca_window_manager.cc b/ui/ozone/platform/caca/caca_window_manager.cc
index 561a57d886410b3cf09e5f6c52911c60561ff480..9fb8c9ee2f310628fd0b48601d781c5617251794 100644
--- a/ui/ozone/platform/caca/caca_window_manager.cc
+++ b/ui/ozone/platform/caca/caca_window_manager.cc
@@ -31,7 +31,7 @@ class CacaSurface : public ui::SurfaceOzoneCanvas {
skia::RefPtr<SkSurface> GetSurface() override;
void ResizeCanvas(const gfx::Size& viewport_size) override;
void PresentCanvas(const gfx::Rect& damage) override;
- scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override;
+ std::unique_ptr<gfx::VSyncProvider> CreateVSyncProvider() override;
private:
CacaWindow* window_; // Not owned.
@@ -102,7 +102,7 @@ void CacaSurface::PresentCanvas(const gfx::Rect& damage) {
caca_refresh_display(window_->display());
}
-scoped_ptr<gfx::VSyncProvider> CacaSurface::CreateVSyncProvider() {
+std::unique_ptr<gfx::VSyncProvider> CacaSurface::CreateVSyncProvider() {
return nullptr;
}
@@ -131,13 +131,13 @@ bool CacaWindowManager::LoadEGLGLES2Bindings(
return false;
}
-scoped_ptr<ui::SurfaceOzoneCanvas> CacaWindowManager::CreateCanvasForWidget(
- gfx::AcceleratedWidget widget) {
+std::unique_ptr<ui::SurfaceOzoneCanvas>
+CacaWindowManager::CreateCanvasForWidget(gfx::AcceleratedWidget widget) {
DCHECK(thread_checker_.CalledOnValidThread());
CacaWindow* window = windows_.Lookup(widget);
DCHECK(window);
- scoped_ptr<CacaSurface> canvas(new CacaSurface(window));
+ std::unique_ptr<CacaSurface> canvas(new CacaSurface(window));
bool initialized = canvas->Initialize();
DCHECK(initialized);
return std::move(canvas);
« no previous file with comments | « ui/ozone/platform/caca/caca_window_manager.h ('k') | ui/ozone/platform/caca/ozone_platform_caca.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698