| 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 <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 void ProcessWillChangeWindowHierarchy(const ServerWindow* window, | 151 void ProcessWillChangeWindowHierarchy(const ServerWindow* window, |
| 152 const ServerWindow* new_parent, | 152 const ServerWindow* new_parent, |
| 153 const ServerWindow* old_parent); | 153 const ServerWindow* old_parent); |
| 154 void ProcessWindowHierarchyChanged(const ServerWindow* window, | 154 void ProcessWindowHierarchyChanged(const ServerWindow* window, |
| 155 const ServerWindow* new_parent, | 155 const ServerWindow* new_parent, |
| 156 const ServerWindow* old_parent); | 156 const ServerWindow* old_parent); |
| 157 void ProcessWindowReorder(const ServerWindow* window, | 157 void ProcessWindowReorder(const ServerWindow* window, |
| 158 const ServerWindow* relative_window, | 158 const ServerWindow* relative_window, |
| 159 const mojom::OrderDirection direction); | 159 const mojom::OrderDirection direction); |
| 160 void ProcessWindowDeleted(const WindowId& window); | 160 void ProcessWindowDeleted(const WindowId& window); |
| 161 void ProcessWillChangeWindowPredefinedCursor(ServerWindow* window, |
| 162 int32_t cursor_id); |
| 161 | 163 |
| 162 private: | 164 private: |
| 163 friend class Operation; | 165 friend class Operation; |
| 164 | 166 |
| 165 using ConnectionMap = std::map<ConnectionSpecificId, ClientConnection*>; | 167 using ConnectionMap = std::map<ConnectionSpecificId, ClientConnection*>; |
| 166 using HostConnectionMap = | 168 using HostConnectionMap = |
| 167 std::map<WindowTreeHostImpl*, WindowTreeHostConnection*>; | 169 std::map<WindowTreeHostImpl*, WindowTreeHostConnection*>; |
| 168 | 170 |
| 169 struct InFlightWindowManagerChange { | 171 struct InFlightWindowManagerChange { |
| 170 // Identifies the client that initiated the change. | 172 // Identifies the client that initiated the change. |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 const gfx::Insets& old_client_area, | 220 const gfx::Insets& old_client_area, |
| 219 const gfx::Insets& new_client_area) override; | 221 const gfx::Insets& new_client_area) override; |
| 220 void OnWindowReordered(ServerWindow* window, | 222 void OnWindowReordered(ServerWindow* window, |
| 221 ServerWindow* relative, | 223 ServerWindow* relative, |
| 222 mojom::OrderDirection direction) override; | 224 mojom::OrderDirection direction) override; |
| 223 void OnWillChangeWindowVisibility(ServerWindow* window) override; | 225 void OnWillChangeWindowVisibility(ServerWindow* window) override; |
| 224 void OnWindowSharedPropertyChanged( | 226 void OnWindowSharedPropertyChanged( |
| 225 ServerWindow* window, | 227 ServerWindow* window, |
| 226 const std::string& name, | 228 const std::string& name, |
| 227 const std::vector<uint8_t>* new_data) override; | 229 const std::vector<uint8_t>* new_data) override; |
| 230 void OnWindowPredefinedCursorChanged(ServerWindow* window, |
| 231 int32_t cursor_id) override; |
| 228 void OnWindowTextInputStateChanged(ServerWindow* window, | 232 void OnWindowTextInputStateChanged(ServerWindow* window, |
| 229 const ui::TextInputState& state) override; | 233 const ui::TextInputState& state) override; |
| 230 void OnTransientWindowAdded(ServerWindow* window, | 234 void OnTransientWindowAdded(ServerWindow* window, |
| 231 ServerWindow* transient_child) override; | 235 ServerWindow* transient_child) override; |
| 232 void OnTransientWindowRemoved(ServerWindow* window, | 236 void OnTransientWindowRemoved(ServerWindow* window, |
| 233 ServerWindow* transient_child) override; | 237 ServerWindow* transient_child) override; |
| 234 | 238 |
| 235 ConnectionManagerDelegate* delegate_; | 239 ConnectionManagerDelegate* delegate_; |
| 236 | 240 |
| 237 // State for rendering into a Surface. | 241 // State for rendering into a Surface. |
| (...skipping 24 matching lines...) Expand all Loading... |
| 262 // Next id supplied to the window manager. | 266 // Next id supplied to the window manager. |
| 263 uint32_t next_wm_change_id_; | 267 uint32_t next_wm_change_id_; |
| 264 | 268 |
| 265 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); | 269 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); |
| 266 }; | 270 }; |
| 267 | 271 |
| 268 } // namespace ws | 272 } // namespace ws |
| 269 } // namespace mus | 273 } // namespace mus |
| 270 | 274 |
| 271 #endif // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ | 275 #endif // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ |
| OLD | NEW |