| 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 COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ | 5 #ifndef COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ |
| 6 #define COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ | 6 #define COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> |
| 9 #include <set> | 10 #include <set> |
| 10 | 11 |
| 11 #include "base/macros.h" | 12 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | |
| 13 #include "components/mus/ws/ids.h" | 13 #include "components/mus/ws/ids.h" |
| 14 #include "components/mus/ws/user_id.h" | 14 #include "components/mus/ws/user_id.h" |
| 15 | 15 |
| 16 namespace mus { | 16 namespace mus { |
| 17 namespace ws { | 17 namespace ws { |
| 18 | 18 |
| 19 class Display; | 19 class Display; |
| 20 class DisplayManagerDelegate; | 20 class DisplayManagerDelegate; |
| 21 class ServerWindow; | 21 class ServerWindow; |
| 22 class UserDisplayManager; | 22 class UserDisplayManager; |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 void OnDisplayAcceleratedWidgetAvailable(Display* display); | 78 void OnDisplayAcceleratedWidgetAvailable(Display* display); |
| 79 | 79 |
| 80 private: | 80 private: |
| 81 DisplayManagerDelegate* delegate_; | 81 DisplayManagerDelegate* delegate_; |
| 82 | 82 |
| 83 // Displays are initially added to |pending_displays_|. When the display is | 83 // Displays are initially added to |pending_displays_|. When the display is |
| 84 // initialized it is moved to |displays_|. WindowServer owns the Displays. | 84 // initialized it is moved to |displays_|. WindowServer owns the Displays. |
| 85 std::set<Display*> pending_displays_; | 85 std::set<Display*> pending_displays_; |
| 86 std::set<Display*> displays_; | 86 std::set<Display*> displays_; |
| 87 | 87 |
| 88 std::map<UserId, scoped_ptr<UserDisplayManager>> user_display_managers_; | 88 std::map<UserId, std::unique_ptr<UserDisplayManager>> user_display_managers_; |
| 89 | 89 |
| 90 // ID to use for next root node. | 90 // ID to use for next root node. |
| 91 ConnectionSpecificId next_root_id_; | 91 ConnectionSpecificId next_root_id_; |
| 92 | 92 |
| 93 uint32_t next_display_id_; | 93 uint32_t next_display_id_; |
| 94 | 94 |
| 95 DISALLOW_COPY_AND_ASSIGN(DisplayManager); | 95 DISALLOW_COPY_AND_ASSIGN(DisplayManager); |
| 96 }; | 96 }; |
| 97 | 97 |
| 98 } // namespace ws | 98 } // namespace ws |
| 99 } // namespace mus | 99 } // namespace mus |
| 100 | 100 |
| 101 #endif // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ | 101 #endif // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ |
| OLD | NEW |