| 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 | 10 |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/timer/timer.h" | 13 #include "base/timer/timer.h" |
| 14 #include "components/mus/public/interfaces/window_tree.mojom.h" | 14 #include "components/mus/public/interfaces/window_tree.mojom.h" |
| 15 #include "components/mus/public/interfaces/window_tree_host.mojom.h" | 15 #include "components/mus/public/interfaces/window_tree_host.mojom.h" |
| 16 #include "components/mus/surfaces/surfaces_state.h" | 16 #include "components/mus/surfaces/surfaces_state.h" |
| 17 #include "components/mus/ws/focus_controller_delegate.h" | |
| 18 #include "components/mus/ws/ids.h" | 17 #include "components/mus/ws/ids.h" |
| 19 #include "components/mus/ws/operation.h" | 18 #include "components/mus/ws/operation.h" |
| 20 #include "components/mus/ws/server_window_delegate.h" | 19 #include "components/mus/ws/server_window_delegate.h" |
| 21 #include "components/mus/ws/server_window_observer.h" | 20 #include "components/mus/ws/server_window_observer.h" |
| 22 #include "components/mus/ws/window_tree_host_impl.h" | 21 #include "components/mus/ws/window_tree_host_impl.h" |
| 23 #include "mojo/converters/surfaces/custom_surface_converter.h" | 22 #include "mojo/converters/surfaces/custom_surface_converter.h" |
| 24 #include "mojo/public/cpp/bindings/array.h" | 23 #include "mojo/public/cpp/bindings/array.h" |
| 25 #include "mojo/public/cpp/bindings/binding.h" | 24 #include "mojo/public/cpp/bindings/binding.h" |
| 26 | 25 |
| 27 namespace mus { | 26 namespace mus { |
| 28 | |
| 29 namespace ws { | 27 namespace ws { |
| 30 | 28 |
| 31 class ClientConnection; | 29 class ClientConnection; |
| 32 class ConnectionManagerDelegate; | 30 class ConnectionManagerDelegate; |
| 33 class ServerWindow; | 31 class ServerWindow; |
| 34 class WindowTreeHostConnection; | 32 class WindowTreeHostConnection; |
| 35 class WindowTreeImpl; | 33 class WindowTreeImpl; |
| 36 | 34 |
| 37 // ConnectionManager manages the set of connections to the window server (all | 35 // ConnectionManager manages the set of connections to the window server (all |
| 38 // the WindowTreeImpls) as well as providing the root of the hierarchy. | 36 // the WindowTreeImpls) as well as providing the root of the hierarchy. |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 // request. | 256 // request. |
| 259 InFlightWindowManagerChangeMap in_flight_wm_change_map_; | 257 InFlightWindowManagerChangeMap in_flight_wm_change_map_; |
| 260 | 258 |
| 261 // Next id supplied to the window manager. | 259 // Next id supplied to the window manager. |
| 262 uint32_t next_wm_change_id_; | 260 uint32_t next_wm_change_id_; |
| 263 | 261 |
| 264 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); | 262 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); |
| 265 }; | 263 }; |
| 266 | 264 |
| 267 } // namespace ws | 265 } // namespace ws |
| 268 | |
| 269 } // namespace mus | 266 } // namespace mus |
| 270 | 267 |
| 271 #endif // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ | 268 #endif // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ |
| OLD | NEW |