| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 uint32_t flags, | 80 uint32_t flags, |
| 81 std::unique_ptr<AccessPolicy> access_policy); | 81 std::unique_ptr<AccessPolicy> access_policy); |
| 82 | 82 |
| 83 // Adds |tree_impl_ptr| to the set of known trees. Use DestroyTree() to | 83 // Adds |tree_impl_ptr| to the set of known trees. Use DestroyTree() to |
| 84 // destroy the tree. | 84 // destroy the tree. |
| 85 void AddTree(std::unique_ptr<WindowTree> tree_impl_ptr, | 85 void AddTree(std::unique_ptr<WindowTree> tree_impl_ptr, |
| 86 std::unique_ptr<WindowTreeBinding> binding, | 86 std::unique_ptr<WindowTreeBinding> binding, |
| 87 mojom::WindowTreePtr tree_ptr); | 87 mojom::WindowTreePtr tree_ptr); |
| 88 WindowTree* CreateTreeForWindowManager( | 88 WindowTree* CreateTreeForWindowManager( |
| 89 const UserId& user_id, | 89 const UserId& user_id, |
| 90 const std::string& client_name, |
| 90 mojom::WindowTreeRequest window_tree_request, | 91 mojom::WindowTreeRequest window_tree_request, |
| 91 mojom::WindowTreeClientPtr window_tree_client); | 92 mojom::WindowTreeClientPtr window_tree_client); |
| 92 // Invoked when a WindowTree's connection encounters an error. | 93 // Invoked when a WindowTree's connection encounters an error. |
| 93 void DestroyTree(WindowTree* tree); | 94 void DestroyTree(WindowTree* tree); |
| 94 | 95 |
| 95 // Returns the tree by client id. | 96 // Returns the tree by client id. |
| 96 WindowTree* GetTreeWithId(ClientSpecificId client_id); | 97 WindowTree* GetTreeWithId(ClientSpecificId client_id); |
| 97 | 98 |
| 98 WindowTree* GetTreeWithClientName(const std::string& client_name); | 99 WindowTree* GetTreeWithClientName(const std::string& client_name); |
| 99 | 100 |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 | 361 |
| 361 WindowManagerWindowTreeFactorySet window_manager_window_tree_factory_set_; | 362 WindowManagerWindowTreeFactorySet window_manager_window_tree_factory_set_; |
| 362 | 363 |
| 363 DISALLOW_COPY_AND_ASSIGN(WindowServer); | 364 DISALLOW_COPY_AND_ASSIGN(WindowServer); |
| 364 }; | 365 }; |
| 365 | 366 |
| 366 } // namespace ws | 367 } // namespace ws |
| 367 } // namespace ui | 368 } // namespace ui |
| 368 | 369 |
| 369 #endif // SERVICES_UI_WS_WINDOW_SERVER_H_ | 370 #endif // SERVICES_UI_WS_WINDOW_SERVER_H_ |
| OLD | NEW |