| 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 COMPONENTS_MUS_WS_WINDOW_SERVER_H_ | 5 #ifndef COMPONENTS_MUS_WS_WINDOW_SERVER_H_ |
| 6 #define COMPONENTS_MUS_WS_WINDOW_SERVER_H_ | 6 #define COMPONENTS_MUS_WS_WINDOW_SERVER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 const std::map<std::string, std::vector<uint8_t>>& properties); | 66 const std::map<std::string, std::vector<uint8_t>>& properties); |
| 67 | 67 |
| 68 // Returns the id for the next WindowTree. | 68 // Returns the id for the next WindowTree. |
| 69 ClientSpecificId GetAndAdvanceNextClientId(); | 69 ClientSpecificId GetAndAdvanceNextClientId(); |
| 70 | 70 |
| 71 // See description of WindowTree::Embed() for details. This assumes | 71 // See description of WindowTree::Embed() for details. This assumes |
| 72 // |transport_window_id| is valid. | 72 // |transport_window_id| is valid. |
| 73 WindowTree* EmbedAtWindow(ServerWindow* root, | 73 WindowTree* EmbedAtWindow(ServerWindow* root, |
| 74 const UserId& user_id, | 74 const UserId& user_id, |
| 75 mojom::WindowTreeClientPtr client, | 75 mojom::WindowTreeClientPtr client, |
| 76 uint32_t flags, |
| 76 std::unique_ptr<AccessPolicy> access_policy); | 77 std::unique_ptr<AccessPolicy> access_policy); |
| 77 | 78 |
| 78 // Adds |tree_impl_ptr| to the set of known trees. Use DestroyTree() to | 79 // Adds |tree_impl_ptr| to the set of known trees. Use DestroyTree() to |
| 79 // destroy the tree. | 80 // destroy the tree. |
| 80 WindowTree* AddTree(std::unique_ptr<WindowTree> tree_impl_ptr, | 81 WindowTree* AddTree(std::unique_ptr<WindowTree> tree_impl_ptr, |
| 81 std::unique_ptr<WindowTreeBinding> binding, | 82 std::unique_ptr<WindowTreeBinding> binding, |
| 82 mojom::WindowTreePtr tree_ptr); | 83 mojom::WindowTreePtr tree_ptr); |
| 83 WindowTree* CreateTreeForWindowManager(Display* display, | 84 WindowTree* CreateTreeForWindowManager(Display* display, |
| 84 mojom::WindowManagerFactory* factory, | 85 mojom::WindowManagerFactory* factory, |
| 85 ServerWindow* root, | 86 ServerWindow* root, |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 | 313 |
| 313 WindowManagerFactoryRegistry window_manager_factory_registry_; | 314 WindowManagerFactoryRegistry window_manager_factory_registry_; |
| 314 | 315 |
| 315 DISALLOW_COPY_AND_ASSIGN(WindowServer); | 316 DISALLOW_COPY_AND_ASSIGN(WindowServer); |
| 316 }; | 317 }; |
| 317 | 318 |
| 318 } // namespace ws | 319 } // namespace ws |
| 319 } // namespace mus | 320 } // namespace mus |
| 320 | 321 |
| 321 #endif // COMPONENTS_MUS_WS_WINDOW_SERVER_H_ | 322 #endif // COMPONENTS_MUS_WS_WINDOW_SERVER_H_ |
| OLD | NEW |