| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_MANAGER_H_ | 5 #ifndef SERVICES_UI_WS_DISPLAY_MANAGER_H_ |
| 6 #define SERVICES_UI_WS_DISPLAY_MANAGER_H_ | 6 #define SERVICES_UI_WS_DISPLAY_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <set> | 10 #include <set> |
| 11 | 11 |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "services/ui/display/screen_manager_delegate.h" | 13 #include "services/ui/display/screen_manager_delegate.h" |
| 14 #include "services/ui/ws/ids.h" | 14 #include "services/ui/ws/ids.h" |
| 15 #include "services/ui/ws/user_id.h" | 15 #include "services/ui/ws/user_id.h" |
| 16 #include "services/ui/ws/user_id_tracker_observer.h" | 16 #include "services/ui/ws/user_id_tracker_observer.h" |
| 17 #include "ui/display/display.h" | 17 #include "ui/display/display.h" |
| 18 | 18 |
| 19 namespace ui { | 19 namespace ui { |
| 20 class EventRewriter; |
| 20 namespace ws { | 21 namespace ws { |
| 21 | 22 |
| 22 class CursorLocationManager; | 23 class CursorLocationManager; |
| 23 class Display; | 24 class Display; |
| 24 class ServerWindow; | 25 class ServerWindow; |
| 25 class UserDisplayManager; | 26 class UserDisplayManager; |
| 26 class UserIdTracker; | 27 class UserIdTracker; |
| 27 class WindowManagerDisplayRoot; | 28 class WindowManagerDisplayRoot; |
| 28 class WindowServer; | 29 class WindowServer; |
| 29 | 30 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 void OnDisplayAdded(const display::Display& display, | 94 void OnDisplayAdded(const display::Display& display, |
| 94 const display::ViewportMetrics& metrics) override; | 95 const display::ViewportMetrics& metrics) override; |
| 95 void OnDisplayRemoved(int64_t id) override; | 96 void OnDisplayRemoved(int64_t id) override; |
| 96 void OnDisplayModified(const display::Display& display, | 97 void OnDisplayModified(const display::Display& display, |
| 97 const display::ViewportMetrics& metrics) override; | 98 const display::ViewportMetrics& metrics) override; |
| 98 void OnPrimaryDisplayChanged(int64_t primary_display_id) override; | 99 void OnPrimaryDisplayChanged(int64_t primary_display_id) override; |
| 99 | 100 |
| 100 WindowServer* window_server_; | 101 WindowServer* window_server_; |
| 101 UserIdTracker* user_id_tracker_; | 102 UserIdTracker* user_id_tracker_; |
| 102 | 103 |
| 104 // For rewriting ChromeOS function keys. |
| 105 std::unique_ptr<ui::EventRewriter> event_rewriter_; |
| 106 |
| 103 // Displays are initially added to |pending_displays_|. When the display is | 107 // Displays are initially added to |pending_displays_|. When the display is |
| 104 // initialized it is moved to |displays_|. WindowServer owns the Displays. | 108 // initialized it is moved to |displays_|. WindowServer owns the Displays. |
| 105 std::set<Display*> pending_displays_; | 109 std::set<Display*> pending_displays_; |
| 106 std::set<Display*> displays_; | 110 std::set<Display*> displays_; |
| 107 | 111 |
| 108 std::map<UserId, std::unique_ptr<UserDisplayManager>> user_display_managers_; | 112 std::map<UserId, std::unique_ptr<UserDisplayManager>> user_display_managers_; |
| 109 | 113 |
| 110 std::map<UserId, std::unique_ptr<CursorLocationManager>> | 114 std::map<UserId, std::unique_ptr<CursorLocationManager>> |
| 111 cursor_location_managers_; | 115 cursor_location_managers_; |
| 112 | 116 |
| 113 // ID to use for next root node. | 117 // ID to use for next root node. |
| 114 ClientSpecificId next_root_id_; | 118 ClientSpecificId next_root_id_; |
| 115 | 119 |
| 116 DISALLOW_COPY_AND_ASSIGN(DisplayManager); | 120 DISALLOW_COPY_AND_ASSIGN(DisplayManager); |
| 117 }; | 121 }; |
| 118 | 122 |
| 119 } // namespace ws | 123 } // namespace ws |
| 120 } // namespace ui | 124 } // namespace ui |
| 121 | 125 |
| 122 #endif // SERVICES_UI_WS_DISPLAY_MANAGER_H_ | 126 #endif // SERVICES_UI_WS_DISPLAY_MANAGER_H_ |
| OLD | NEW |