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

Unified Diff: services/ui/ws/window_server.cc

Issue 2365753003: mus ws: Move 'reset(new' to base::MakeUnique. (Closed)
Patch Set: Merge with tot Created 4 years, 3 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 | « services/ui/ws/window_manager_client_unittest.cc ('k') | services/ui/ws/window_tree.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_server.cc
diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
index e02e3c84bb2681f73d44cb28d41ac7cc8d0de2f3..61ce2e9378942a6d340c89bbc6b8dffbfbe177cd 100644
--- a/services/ui/ws/window_server.cc
+++ b/services/ui/ws/window_server.cc
@@ -108,8 +108,8 @@ WindowTree* WindowServer::EmbedAtWindow(
WindowServerDelegate::BindingType::EMBED, this, tree,
&window_tree_request, &client);
if (!binding) {
- binding.reset(new ws::DefaultWindowTreeBinding(
- tree, this, std::move(window_tree_request), std::move(client)));
+ binding = base::MakeUnique<ws::DefaultWindowTreeBinding>(
+ tree, this, std::move(window_tree_request), std::move(client));
}
AddTree(std::move(tree_ptr), std::move(binding), std::move(window_tree_ptr));
@@ -137,9 +137,9 @@ WindowTree* WindowServer::CreateTreeForWindowManager(
WindowServerDelegate::BindingType::WINDOW_MANAGER, this,
window_tree.get(), &window_tree_request, &window_tree_client);
if (!window_tree_binding) {
- window_tree_binding.reset(new DefaultWindowTreeBinding(
+ window_tree_binding = base::MakeUnique<DefaultWindowTreeBinding>(
window_tree.get(), this, std::move(window_tree_request),
- std::move(window_tree_client)));
+ std::move(window_tree_client));
}
WindowTree* window_tree_ptr = window_tree.get();
AddTree(std::move(window_tree), std::move(window_tree_binding), nullptr);
« no previous file with comments | « services/ui/ws/window_manager_client_unittest.cc ('k') | services/ui/ws/window_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698