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

Unified Diff: components/mus/public/cpp/lib/window.cc

Issue 1906623003: Convert //components/mus from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « components/mus/public/cpp/lib/output_surface.cc ('k') | components/mus/public/cpp/lib/window_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/public/cpp/lib/window.cc
diff --git a/components/mus/public/cpp/lib/window.cc b/components/mus/public/cpp/lib/window.cc
index 688aa54b2b566cfc99ee39985b9d58a2dac3b203..1e565bae5277f0506e6c86b9f910dac670a30123 100644
--- a/components/mus/public/cpp/lib/window.cc
+++ b/components/mus/public/cpp/lib/window.cc
@@ -247,15 +247,17 @@ bool Window::IsDrawn() const {
return parent_ ? parent_->IsDrawn() : parent_drawn_;
}
-scoped_ptr<WindowSurface> Window::RequestSurface(mojom::SurfaceType type) {
- scoped_ptr<WindowSurfaceBinding> surface_binding;
- scoped_ptr<WindowSurface> surface = WindowSurface::Create(&surface_binding);
+std::unique_ptr<WindowSurface> Window::RequestSurface(mojom::SurfaceType type) {
+ std::unique_ptr<WindowSurfaceBinding> surface_binding;
+ std::unique_ptr<WindowSurface> surface =
+ WindowSurface::Create(&surface_binding);
AttachSurface(type, std::move(surface_binding));
return surface;
}
-void Window::AttachSurface(mojom::SurfaceType type,
- scoped_ptr<WindowSurfaceBinding> surface_binding) {
+void Window::AttachSurface(
+ mojom::SurfaceType type,
+ std::unique_ptr<WindowSurfaceBinding> surface_binding) {
tree_client()->AttachSurface(
server_id_, type, std::move(surface_binding->surface_request_),
mojo::MakeProxy(std::move(surface_binding->surface_client_)));
« no previous file with comments | « components/mus/public/cpp/lib/output_surface.cc ('k') | components/mus/public/cpp/lib/window_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698