| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/mus/ws/window_tree_factory.h" | 5 #include "components/mus/ws/window_tree_factory.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
| 7 #include "components/mus/ws/default_access_policy.h" | 8 #include "components/mus/ws/default_access_policy.h" |
| 8 #include "components/mus/ws/window_server.h" | 9 #include "components/mus/ws/window_server.h" |
| 9 #include "components/mus/ws/window_tree.h" | 10 #include "components/mus/ws/window_tree.h" |
| 10 #include "components/mus/ws/window_tree_binding.h" | 11 #include "components/mus/ws/window_tree_binding.h" |
| 11 | 12 |
| 12 namespace mus { | 13 namespace mus { |
| 13 namespace ws { | 14 namespace ws { |
| 14 | 15 |
| 15 WindowTreeFactory::WindowTreeFactory(WindowServer* window_server, | 16 WindowTreeFactory::WindowTreeFactory(WindowServer* window_server, |
| 16 const UserId& user_id, | 17 const UserId& user_id, |
| 17 const std::string& connection_name, | 18 const std::string& connection_name, |
| 18 mojom::WindowTreeFactoryRequest request) | 19 mojom::WindowTreeFactoryRequest request) |
| 19 : window_server_(window_server), | 20 : window_server_(window_server), |
| 20 user_id_(user_id), | 21 user_id_(user_id), |
| 21 connection_name_(connection_name), | 22 connection_name_(connection_name), |
| 22 binding_(this, std::move(request)) {} | 23 binding_(this, std::move(request)) {} |
| 23 | 24 |
| 24 WindowTreeFactory::~WindowTreeFactory() {} | 25 WindowTreeFactory::~WindowTreeFactory() {} |
| 25 | 26 |
| 26 void WindowTreeFactory::CreateWindowTree( | 27 void WindowTreeFactory::CreateWindowTree( |
| 27 mojo::InterfaceRequest<mojom::WindowTree> tree_request, | 28 mojo::InterfaceRequest<mojom::WindowTree> tree_request, |
| 28 mojom::WindowTreeClientPtr client) { | 29 mojom::WindowTreeClientPtr client) { |
| 29 scoped_ptr<ws::WindowTree> service( | 30 std::unique_ptr<ws::WindowTree> service( |
| 30 new ws::WindowTree(window_server_, user_id_, nullptr, | 31 new ws::WindowTree(window_server_, user_id_, nullptr, |
| 31 make_scoped_ptr(new DefaultAccessPolicy))); | 32 base::WrapUnique(new DefaultAccessPolicy))); |
| 32 scoped_ptr<ws::DefaultWindowTreeBinding> binding( | 33 std::unique_ptr<ws::DefaultWindowTreeBinding> binding( |
| 33 new ws::DefaultWindowTreeBinding(service.get(), window_server_, | 34 new ws::DefaultWindowTreeBinding(service.get(), window_server_, |
| 34 std::move(tree_request), | 35 std::move(tree_request), |
| 35 std::move(client))); | 36 std::move(client))); |
| 36 service->set_connection_name(connection_name_); | 37 service->set_connection_name(connection_name_); |
| 37 window_server_->AddTree(std::move(service), std::move(binding), nullptr); | 38 window_server_->AddTree(std::move(service), std::move(binding), nullptr); |
| 38 } | 39 } |
| 39 | 40 |
| 40 } // namespace ws | 41 } // namespace ws |
| 41 } // namespace mus | 42 } // namespace mus |
| OLD | NEW |