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

Unified Diff: components/mus/ws/display_manager.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/display_binding.cc ('k') | components/mus/ws/display_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/display_manager.h
diff --git a/components/mus/ws/display_manager.h b/components/mus/ws/display_manager.h
index 402569e5891e0d313264b9d781d1da52e3165bbf..85f7c5873f389c05a3677c80eee257bf335997ad 100644
--- a/components/mus/ws/display_manager.h
+++ b/components/mus/ws/display_manager.h
@@ -6,10 +6,10 @@
#define COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_
#include <map>
+#include <memory>
#include <set>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/mus/ws/ids.h"
#include "components/mus/ws/user_id.h"
@@ -85,7 +85,7 @@ class DisplayManager {
std::set<Display*> pending_displays_;
std::set<Display*> displays_;
- std::map<UserId, scoped_ptr<UserDisplayManager>> user_display_managers_;
+ std::map<UserId, std::unique_ptr<UserDisplayManager>> user_display_managers_;
// ID to use for next root node.
ConnectionSpecificId next_root_id_;
« no previous file with comments | « components/mus/ws/display_binding.cc ('k') | components/mus/ws/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698