| 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_CONNECTION_MANAGER_H_ | 5 #ifndef COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ |
| 6 #define COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ | 6 #define COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 void OnConnectionError(ClientConnection* connection); | 63 void OnConnectionError(ClientConnection* connection); |
| 64 | 64 |
| 65 ClientConnection* GetClientConnection(WindowTreeImpl* window_tree); | 65 ClientConnection* GetClientConnection(WindowTreeImpl* window_tree); |
| 66 | 66 |
| 67 // Invoked when a WindowTreeHostConnection encounters an error or the | 67 // Invoked when a WindowTreeHostConnection encounters an error or the |
| 68 // associated Display window is closed. | 68 // associated Display window is closed. |
| 69 void OnHostConnectionClosed(WindowTreeHostConnection* connection); | 69 void OnHostConnectionClosed(WindowTreeHostConnection* connection); |
| 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 WindowTreeImpl* EmbedAtWindow(ConnectionSpecificId creator_id, | 73 WindowTreeImpl* EmbedAtWindow(const WindowId& window_id, |
| 74 const WindowId& window_id, | |
| 75 uint32_t policy_bitmask, | 74 uint32_t policy_bitmask, |
| 76 mojom::WindowTreeClientPtr client); | 75 mojom::WindowTreeClientPtr client); |
| 77 | 76 |
| 78 // Returns the connection by id. | 77 // Returns the connection by id. |
| 79 WindowTreeImpl* GetConnection(ConnectionSpecificId connection_id); | 78 WindowTreeImpl* GetConnection(ConnectionSpecificId connection_id); |
| 80 | 79 |
| 81 // Returns the Window identified by |id|. | 80 // Returns the Window identified by |id|. |
| 82 ServerWindow* GetWindow(const WindowId& id); | 81 ServerWindow* GetWindow(const WindowId& id); |
| 83 | 82 |
| 84 // Returns whether |window| is a descendant of some root window but not itself | 83 // Returns whether |window| is a descendant of some root window but not itself |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 // Next id supplied to the window manager. | 274 // Next id supplied to the window manager. |
| 276 uint32_t next_wm_change_id_; | 275 uint32_t next_wm_change_id_; |
| 277 | 276 |
| 278 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); | 277 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); |
| 279 }; | 278 }; |
| 280 | 279 |
| 281 } // namespace ws | 280 } // namespace ws |
| 282 } // namespace mus | 281 } // namespace mus |
| 283 | 282 |
| 284 #endif // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ | 283 #endif // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ |
| OLD | NEW |