| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_DISPLAY_H_ | 5 #ifndef SERVICES_UI_WS_DISPLAY_H_ |
| 6 #define SERVICES_UI_WS_DISPLAY_H_ | 6 #define SERVICES_UI_WS_DISPLAY_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| 11 #include <memory> | 11 #include <memory> |
| 12 #include <queue> | 12 #include <queue> |
| 13 #include <set> | 13 #include <set> |
| 14 | 14 |
| 15 #include "base/macros.h" | 15 #include "base/macros.h" |
| 16 #include "base/memory/weak_ptr.h" | 16 #include "base/memory/weak_ptr.h" |
| 17 #include "cc/surfaces/surface_id_allocator.h" |
| 17 #include "services/ui/common/types.h" | 18 #include "services/ui/common/types.h" |
| 18 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" | 19 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" |
| 19 #include "services/ui/public/interfaces/window_tree_host.mojom.h" | 20 #include "services/ui/public/interfaces/window_tree_host.mojom.h" |
| 20 #include "services/ui/ws/focus_controller_delegate.h" | 21 #include "services/ui/ws/focus_controller_delegate.h" |
| 21 #include "services/ui/ws/focus_controller_observer.h" | 22 #include "services/ui/ws/focus_controller_observer.h" |
| 22 #include "services/ui/ws/platform_display.h" | 23 #include "services/ui/ws/platform_display.h" |
| 23 #include "services/ui/ws/platform_display_delegate.h" | 24 #include "services/ui/ws/platform_display_delegate.h" |
| 24 #include "services/ui/ws/server_window.h" | 25 #include "services/ui/ws/server_window.h" |
| 25 #include "services/ui/ws/server_window_observer.h" | 26 #include "services/ui/ws/server_window_observer.h" |
| 26 #include "services/ui/ws/server_window_tracker.h" | 27 #include "services/ui/ws/server_window_tracker.h" |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 WindowServer* const window_server_; | 196 WindowServer* const window_server_; |
| 196 std::unique_ptr<ServerWindow> root_; | 197 std::unique_ptr<ServerWindow> root_; |
| 197 std::unique_ptr<PlatformDisplay> platform_display_; | 198 std::unique_ptr<PlatformDisplay> platform_display_; |
| 198 std::unique_ptr<FocusController> focus_controller_; | 199 std::unique_ptr<FocusController> focus_controller_; |
| 199 | 200 |
| 200 // The last cursor set. Used to track whether we need to change the cursor. | 201 // The last cursor set. Used to track whether we need to change the cursor. |
| 201 mojom::Cursor last_cursor_; | 202 mojom::Cursor last_cursor_; |
| 202 | 203 |
| 203 ServerWindowTracker activation_parents_; | 204 ServerWindowTracker activation_parents_; |
| 204 | 205 |
| 206 cc::SurfaceIdAllocator allocator_; |
| 207 |
| 205 WindowManagerDisplayRootMap window_manager_display_root_map_; | 208 WindowManagerDisplayRootMap window_manager_display_root_map_; |
| 206 | 209 |
| 207 DISALLOW_COPY_AND_ASSIGN(Display); | 210 DISALLOW_COPY_AND_ASSIGN(Display); |
| 208 }; | 211 }; |
| 209 | 212 |
| 210 } // namespace ws | 213 } // namespace ws |
| 211 } // namespace ui | 214 } // namespace ui |
| 212 | 215 |
| 213 #endif // SERVICES_UI_WS_DISPLAY_H_ | 216 #endif // SERVICES_UI_WS_DISPLAY_H_ |
| OLD | NEW |