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

Unified Diff: components/mus/public/cpp/window_surface.h

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
Index: components/mus/public/cpp/window_surface.h
diff --git a/components/mus/public/cpp/window_surface.h b/components/mus/public/cpp/window_surface.h
index ae15193a3406d2a65186fa054f9566fcb78f9a23..6fa60a7d8ec6dfa59fbaf540fd305f75339a3b2c 100644
--- a/components/mus/public/cpp/window_surface.h
+++ b/components/mus/public/cpp/window_surface.h
@@ -5,8 +5,9 @@
#ifndef COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_
#define COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/threading/thread_checker.h"
#include "components/mus/public/interfaces/compositor_frame.mojom.h"
@@ -24,8 +25,8 @@ class Window;
class WindowSurface : public mojom::SurfaceClient {
public:
// static
- static scoped_ptr<WindowSurface> Create(
- scoped_ptr<WindowSurfaceBinding>* surface_binding);
+ static std::unique_ptr<WindowSurface> Create(
+ std::unique_ptr<WindowSurfaceBinding>* surface_binding);
~WindowSurface() override;
@@ -52,8 +53,8 @@ class WindowSurface : public mojom::SurfaceClient {
mojo::InterfacePtrInfo<mojom::Surface> surface_info_;
mojo::InterfaceRequest<mojom::SurfaceClient> client_request_;
mojom::SurfacePtr surface_;
- scoped_ptr<mojo::Binding<mojom::SurfaceClient>> client_binding_;
- scoped_ptr<base::ThreadChecker> thread_checker_;
+ std::unique_ptr<mojo::Binding<mojom::SurfaceClient>> client_binding_;
+ std::unique_ptr<base::ThreadChecker> thread_checker_;
DISALLOW_COPY_AND_ASSIGN(WindowSurface);
};
« no previous file with comments | « components/mus/public/cpp/window_manager_delegate.h ('k') | components/mus/public/cpp/window_tree_host_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698