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

Unified Diff: components/mus/ws/window_server.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
« no previous file with comments | « components/mus/ws/window_manager_state_unittest.cc ('k') | components/mus/ws/window_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/window_server.h
diff --git a/components/mus/ws/window_server.h b/components/mus/ws/window_server.h
index 309788f49704585646616e6faf7d66cf8a4bbb58..21b464e634d19350abb0993cd3fc50e4d3855412 100644
--- a/components/mus/ws/window_server.h
+++ b/components/mus/ws/window_server.h
@@ -8,10 +8,10 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/mus/public/interfaces/window_manager_factory.mojom.h"
#include "components/mus/public/interfaces/window_tree.mojom.h"
#include "components/mus/public/interfaces/window_tree_host.mojom.h"
@@ -73,12 +73,12 @@ class WindowServer : public ServerWindowDelegate,
WindowTree* EmbedAtWindow(ServerWindow* root,
const UserId& user_id,
mojom::WindowTreeClientPtr client,
- scoped_ptr<AccessPolicy> access_policy);
+ std::unique_ptr<AccessPolicy> access_policy);
// Adds |tree_impl_ptr| to the set of known trees. Use DestroyTree() to
// destroy the tree.
- WindowTree* AddTree(scoped_ptr<WindowTree> tree_impl_ptr,
- scoped_ptr<WindowTreeBinding> binding,
+ WindowTree* AddTree(std::unique_ptr<WindowTree> tree_impl_ptr,
+ std::unique_ptr<WindowTreeBinding> binding,
mojom::WindowTreePtr tree_ptr);
WindowTree* CreateTreeForWindowManager(Display* display,
mojom::WindowManagerFactory* factory,
@@ -195,7 +195,8 @@ class WindowServer : public ServerWindowDelegate,
private:
friend class Operation;
- using WindowTreeMap = std::map<ConnectionSpecificId, scoped_ptr<WindowTree>>;
+ using WindowTreeMap =
+ std::map<ConnectionSpecificId, std::unique_ptr<WindowTree>>;
struct InFlightWindowManagerChange {
// Identifies the client that initiated the change.
@@ -286,7 +287,7 @@ class WindowServer : public ServerWindowDelegate,
// ID to use for next WindowTree.
ConnectionSpecificId next_connection_id_;
- scoped_ptr<DisplayManager> display_manager_;
+ std::unique_ptr<DisplayManager> display_manager_;
// Set of WindowTrees.
WindowTreeMap tree_map_;
« no previous file with comments | « components/mus/ws/window_manager_state_unittest.cc ('k') | components/mus/ws/window_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698