| 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> |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 // UserIdTrackerObserver: | 80 // UserIdTrackerObserver: |
| 81 void OnActiveUserIdChanged(const UserId& previously_active_id, | 81 void OnActiveUserIdChanged(const UserId& previously_active_id, |
| 82 const UserId& active_id) override; | 82 const UserId& active_id) override; |
| 83 | 83 |
| 84 // display::PlatformScreenDelegate: | 84 // display::PlatformScreenDelegate: |
| 85 void OnDisplayAdded(int64_t id, | 85 void OnDisplayAdded(int64_t id, |
| 86 const display::ViewportMetrics& metrics) override; | 86 const display::ViewportMetrics& metrics) override; |
| 87 void OnDisplayRemoved(int64_t id) override; | 87 void OnDisplayRemoved(int64_t id) override; |
| 88 void OnDisplayModified(int64_t id, | 88 void OnDisplayModified(int64_t id, |
| 89 const display::ViewportMetrics& metrics) override; | 89 const display::ViewportMetrics& metrics) override; |
| 90 void OnPrimaryDisplayChanged(int64_t primary_display_id) override; |
| 90 | 91 |
| 91 WindowServer* window_server_; | 92 WindowServer* window_server_; |
| 92 UserIdTracker* user_id_tracker_; | 93 UserIdTracker* user_id_tracker_; |
| 93 | 94 |
| 94 // Displays are initially added to |pending_displays_|. When the display is | 95 // Displays are initially added to |pending_displays_|. When the display is |
| 95 // initialized it is moved to |displays_|. WindowServer owns the Displays. | 96 // initialized it is moved to |displays_|. WindowServer owns the Displays. |
| 96 std::set<Display*> pending_displays_; | 97 std::set<Display*> pending_displays_; |
| 97 std::set<Display*> displays_; | 98 std::set<Display*> displays_; |
| 98 | 99 |
| 99 std::map<UserId, std::unique_ptr<UserDisplayManager>> user_display_managers_; | 100 std::map<UserId, std::unique_ptr<UserDisplayManager>> user_display_managers_; |
| 100 | 101 |
| 101 // ID to use for next root node. | 102 // ID to use for next root node. |
| 102 ClientSpecificId next_root_id_; | 103 ClientSpecificId next_root_id_; |
| 103 | 104 |
| 104 DISALLOW_COPY_AND_ASSIGN(DisplayManager); | 105 DISALLOW_COPY_AND_ASSIGN(DisplayManager); |
| 105 }; | 106 }; |
| 106 | 107 |
| 107 } // namespace ws | 108 } // namespace ws |
| 108 } // namespace ui | 109 } // namespace ui |
| 109 | 110 |
| 110 #endif // SERVICES_UI_WS_DISPLAY_MANAGER_H_ | 111 #endif // SERVICES_UI_WS_DISPLAY_MANAGER_H_ |
| OLD | NEW |