| 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 "services/ui/common/types.h" | 17 #include "services/ui/common/types.h" |
| 18 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" | 18 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" |
| 19 #include "services/ui/public/interfaces/window_tree_host.mojom.h" | 19 #include "services/ui/public/interfaces/window_tree_host.mojom.h" |
| 20 #include "services/ui/ws/focus_controller_delegate.h" | 20 #include "services/ui/ws/focus_controller_delegate.h" |
| 21 #include "services/ui/ws/focus_controller_observer.h" | 21 #include "services/ui/ws/focus_controller_observer.h" |
| 22 #include "services/ui/ws/platform_display.h" | 22 #include "services/ui/ws/platform_display.h" |
| 23 #include "services/ui/ws/platform_display_delegate.h" |
| 23 #include "services/ui/ws/server_window.h" | 24 #include "services/ui/ws/server_window.h" |
| 24 #include "services/ui/ws/server_window_observer.h" | 25 #include "services/ui/ws/server_window_observer.h" |
| 25 #include "services/ui/ws/server_window_tracker.h" | 26 #include "services/ui/ws/server_window_tracker.h" |
| 26 #include "services/ui/ws/user_id_tracker_observer.h" | 27 #include "services/ui/ws/user_id_tracker_observer.h" |
| 27 #include "services/ui/ws/window_manager_window_tree_factory_set_observer.h" | 28 #include "services/ui/ws/window_manager_window_tree_factory_set_observer.h" |
| 28 #include "ui/display/display.h" | 29 #include "ui/display/display.h" |
| 29 | 30 |
| 30 namespace ui { | 31 namespace ui { |
| 31 namespace ws { | 32 namespace ws { |
| 32 | 33 |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 | 200 |
| 200 WindowManagerDisplayRootMap window_manager_display_root_map_; | 201 WindowManagerDisplayRootMap window_manager_display_root_map_; |
| 201 | 202 |
| 202 DISALLOW_COPY_AND_ASSIGN(Display); | 203 DISALLOW_COPY_AND_ASSIGN(Display); |
| 203 }; | 204 }; |
| 204 | 205 |
| 205 } // namespace ws | 206 } // namespace ws |
| 206 } // namespace ui | 207 } // namespace ui |
| 207 | 208 |
| 208 #endif // SERVICES_UI_WS_DISPLAY_H_ | 209 #endif // SERVICES_UI_WS_DISPLAY_H_ |
| OLD | NEW |