| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef SERVICES_UI_WS_WINDOW_SERVER_H_ | 5 #ifndef SERVICES_UI_WS_WINDOW_SERVER_H_ |
| 6 #define SERVICES_UI_WS_WINDOW_SERVER_H_ | 6 #define SERVICES_UI_WS_WINDOW_SERVER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 std::unique_ptr<AccessPolicy> access_policy); | 84 std::unique_ptr<AccessPolicy> access_policy); |
| 85 | 85 |
| 86 // Adds |tree_impl_ptr| to the set of known trees. Use DestroyTree() to | 86 // Adds |tree_impl_ptr| to the set of known trees. Use DestroyTree() to |
| 87 // destroy the tree. | 87 // destroy the tree. |
| 88 void AddTree(std::unique_ptr<WindowTree> tree_impl_ptr, | 88 void AddTree(std::unique_ptr<WindowTree> tree_impl_ptr, |
| 89 std::unique_ptr<WindowTreeBinding> binding, | 89 std::unique_ptr<WindowTreeBinding> binding, |
| 90 mojom::WindowTreePtr tree_ptr); | 90 mojom::WindowTreePtr tree_ptr); |
| 91 WindowTree* CreateTreeForWindowManager( | 91 WindowTree* CreateTreeForWindowManager( |
| 92 const UserId& user_id, | 92 const UserId& user_id, |
| 93 mojom::WindowTreeRequest window_tree_request, | 93 mojom::WindowTreeRequest window_tree_request, |
| 94 mojom::WindowTreeClientPtr window_tree_client); | 94 mojom::WindowTreeClientPtr window_tree_client, |
| 95 bool automatically_create_display_roots); |
| 95 // Invoked when a WindowTree's connection encounters an error. | 96 // Invoked when a WindowTree's connection encounters an error. |
| 96 void DestroyTree(WindowTree* tree); | 97 void DestroyTree(WindowTree* tree); |
| 97 | 98 |
| 98 // Returns the tree by client id. | 99 // Returns the tree by client id. |
| 99 WindowTree* GetTreeWithId(ClientSpecificId client_id); | 100 WindowTree* GetTreeWithId(ClientSpecificId client_id); |
| 100 | 101 |
| 101 WindowTree* GetTreeWithClientName(const std::string& client_name); | 102 WindowTree* GetTreeWithClientName(const std::string& client_name); |
| 102 | 103 |
| 103 size_t num_trees() const { return tree_map_.size(); } | 104 size_t num_trees() const { return tree_map_.size(); } |
| 104 | 105 |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 frame_sink_manager_client_binding_; | 388 frame_sink_manager_client_binding_; |
| 388 cc::mojom::FrameSinkManagerPtr frame_sink_manager_; | 389 cc::mojom::FrameSinkManagerPtr frame_sink_manager_; |
| 389 | 390 |
| 390 DISALLOW_COPY_AND_ASSIGN(WindowServer); | 391 DISALLOW_COPY_AND_ASSIGN(WindowServer); |
| 391 }; | 392 }; |
| 392 | 393 |
| 393 } // namespace ws | 394 } // namespace ws |
| 394 } // namespace ui | 395 } // namespace ui |
| 395 | 396 |
| 396 #endif // SERVICES_UI_WS_WINDOW_SERVER_H_ | 397 #endif // SERVICES_UI_WS_WINDOW_SERVER_H_ |
| OLD | NEW |