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

Unified Diff: components/mus/ws/window_tree_factory.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/ws/window_tree_client_unittest.cc ('k') | components/mus/ws/window_tree_host_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/window_tree_factory.cc
diff --git a/components/mus/ws/window_tree_factory.cc b/components/mus/ws/window_tree_factory.cc
index f31b2861e18f9a59e7a317f059396ce23131741f..d4072baed77f6ebcf05f766d6f9f6dab78ba29fa 100644
--- a/components/mus/ws/window_tree_factory.cc
+++ b/components/mus/ws/window_tree_factory.cc
@@ -4,6 +4,7 @@
#include "components/mus/ws/window_tree_factory.h"
+#include "base/memory/ptr_util.h"
#include "components/mus/ws/default_access_policy.h"
#include "components/mus/ws/window_server.h"
#include "components/mus/ws/window_tree.h"
@@ -26,10 +27,10 @@ WindowTreeFactory::~WindowTreeFactory() {}
void WindowTreeFactory::CreateWindowTree(
mojo::InterfaceRequest<mojom::WindowTree> tree_request,
mojom::WindowTreeClientPtr client) {
- scoped_ptr<ws::WindowTree> service(
+ std::unique_ptr<ws::WindowTree> service(
new ws::WindowTree(window_server_, user_id_, nullptr,
- make_scoped_ptr(new DefaultAccessPolicy)));
- scoped_ptr<ws::DefaultWindowTreeBinding> binding(
+ base::WrapUnique(new DefaultAccessPolicy)));
+ std::unique_ptr<ws::DefaultWindowTreeBinding> binding(
new ws::DefaultWindowTreeBinding(service.get(), window_server_,
std::move(tree_request),
std::move(client)));
« no previous file with comments | « components/mus/ws/window_tree_client_unittest.cc ('k') | components/mus/ws/window_tree_host_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698