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

Unified Diff: ui/views/mus/window_manager_connection.h

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/views/mus/surface_context_factory.cc ('k') | ui/views/mus/window_tree_host_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/window_manager_connection.h
diff --git a/ui/views/mus/window_manager_connection.h b/ui/views/mus/window_manager_connection.h
index 690598933467bb4edc82ae94991c4b3e934e7234..271691978b4aa6a8c86bd1a49596c6863b8b1fc1 100644
--- a/ui/views/mus/window_manager_connection.h
+++ b/ui/views/mus/window_manager_connection.h
@@ -7,8 +7,9 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/mus/public/cpp/window_tree_delegate.h"
#include "ui/views/mus/mus_export.h"
#include "ui/views/mus/screen_mus_delegate.h"
@@ -66,8 +67,8 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
void OnWindowManagerFrameValuesChanged() override;
mojo::Connector* connector_;
- scoped_ptr<ScreenMus> screen_;
- scoped_ptr<mus::WindowTreeConnection> window_tree_connection_;
+ std::unique_ptr<ScreenMus> screen_;
+ std::unique_ptr<mus::WindowTreeConnection> window_tree_connection_;
DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection);
};
« no previous file with comments | « ui/views/mus/surface_context_factory.cc ('k') | ui/views/mus/window_tree_host_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698