| 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 "services/ui/ws/window_manager_window_tree_factory.h" | 5 #include "services/ui/ws/window_manager_window_tree_factory.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "services/ui/ws/window_manager_window_tree_factory_set.h" | 8 #include "services/ui/ws/window_manager_window_tree_factory_set.h" |
| 9 #include "services/ui/ws/window_server.h" | 9 #include "services/ui/ws/window_server.h" |
| 10 #include "services/ui/ws/window_tree.h" | 10 #include "services/ui/ws/window_tree.h" |
| 11 | 11 |
| 12 namespace ui { | 12 namespace ui { |
| 13 namespace ws { | 13 namespace ws { |
| 14 | 14 |
| 15 WindowManagerWindowTreeFactory::WindowManagerWindowTreeFactory( | 15 WindowManagerWindowTreeFactory::WindowManagerWindowTreeFactory( |
| 16 WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set, | 16 WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set, |
| 17 const UserId& user_id, | 17 const UserId& user_id, |
| 18 const std::string& client_name, |
| 18 mojo::InterfaceRequest<mojom::WindowManagerWindowTreeFactory> request) | 19 mojo::InterfaceRequest<mojom::WindowManagerWindowTreeFactory> request) |
| 19 : window_manager_window_tree_factory_set_( | 20 : window_manager_window_tree_factory_set_( |
| 20 window_manager_window_tree_factory_set), | 21 window_manager_window_tree_factory_set), |
| 21 user_id_(user_id), | 22 user_id_(user_id), |
| 23 client_name_(client_name), |
| 22 binding_(this), | 24 binding_(this), |
| 23 window_tree_(nullptr) { | 25 window_tree_(nullptr) { |
| 24 if (request.is_pending()) | 26 if (request.is_pending()) |
| 25 binding_.Bind(std::move(request)); | 27 binding_.Bind(std::move(request)); |
| 26 } | 28 } |
| 27 | 29 |
| 28 WindowManagerWindowTreeFactory::~WindowManagerWindowTreeFactory() {} | 30 WindowManagerWindowTreeFactory::~WindowManagerWindowTreeFactory() {} |
| 29 | 31 |
| 30 void WindowManagerWindowTreeFactory::CreateWindowTree( | 32 void WindowManagerWindowTreeFactory::CreateWindowTree( |
| 31 mojom::WindowTreeRequest window_tree_request, | 33 mojom::WindowTreeRequest window_tree_request, |
| 32 mojom::WindowTreeClientPtr window_tree_client) { | 34 mojom::WindowTreeClientPtr window_tree_client) { |
| 33 // CreateWindowTree() can only be called once, so there is no reason to keep | 35 // CreateWindowTree() can only be called once, so there is no reason to keep |
| 34 // the binding around. | 36 // the binding around. |
| 35 if (binding_.is_bound()) | 37 if (binding_.is_bound()) |
| 36 binding_.Close(); | 38 binding_.Close(); |
| 37 | 39 |
| 38 SetWindowTree(GetWindowServer()->CreateTreeForWindowManager( | 40 SetWindowTree(GetWindowServer()->CreateTreeForWindowManager( |
| 39 user_id_, std::move(window_tree_request), std::move(window_tree_client))); | 41 user_id_, client_name_, std::move(window_tree_request), |
| 42 std::move(window_tree_client))); |
| 40 } | 43 } |
| 41 | 44 |
| 42 WindowManagerWindowTreeFactory::WindowManagerWindowTreeFactory( | 45 WindowManagerWindowTreeFactory::WindowManagerWindowTreeFactory( |
| 43 WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set, | 46 WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set, |
| 44 const UserId& user_id) | 47 const UserId& user_id) |
| 45 : window_manager_window_tree_factory_set_( | 48 : window_manager_window_tree_factory_set_( |
| 46 window_manager_window_tree_factory_set), | 49 window_manager_window_tree_factory_set), |
| 47 user_id_(user_id), | 50 user_id_(user_id), |
| 48 binding_(this), | 51 binding_(this), |
| 49 window_tree_(nullptr) {} | 52 window_tree_(nullptr) {} |
| 50 | 53 |
| 51 WindowServer* WindowManagerWindowTreeFactory::GetWindowServer() { | 54 WindowServer* WindowManagerWindowTreeFactory::GetWindowServer() { |
| 52 return window_manager_window_tree_factory_set_->window_server(); | 55 return window_manager_window_tree_factory_set_->window_server(); |
| 53 } | 56 } |
| 54 | 57 |
| 55 void WindowManagerWindowTreeFactory::SetWindowTree(WindowTree* window_tree) { | 58 void WindowManagerWindowTreeFactory::SetWindowTree(WindowTree* window_tree) { |
| 56 DCHECK(!window_tree_); | 59 DCHECK(!window_tree_); |
| 57 window_tree_ = window_tree; | 60 window_tree_ = window_tree; |
| 58 | 61 |
| 59 window_manager_window_tree_factory_set_ | 62 window_manager_window_tree_factory_set_ |
| 60 ->OnWindowManagerWindowTreeFactoryReady(this); | 63 ->OnWindowManagerWindowTreeFactoryReady(this); |
| 61 } | 64 } |
| 62 | 65 |
| 63 } // namespace ws | 66 } // namespace ws |
| 64 } // namespace ui | 67 } // namespace ui |
| OLD | NEW |