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> |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 | 155 |
156 // Returns the root window of the active user. | 156 // Returns the root window of the active user. |
157 ServerWindow* GetActiveRootWindow(); | 157 ServerWindow* GetActiveRootWindow(); |
158 | 158 |
159 private: | 159 private: |
160 friend class test::DisplayTestApi; | 160 friend class test::DisplayTestApi; |
161 | 161 |
162 using WindowManagerDisplayRootMap = | 162 using WindowManagerDisplayRootMap = |
163 std::map<UserId, WindowManagerDisplayRoot*>; | 163 std::map<UserId, WindowManagerDisplayRoot*>; |
164 | 164 |
165 // Inits the necessary state once the display is ready. | 165 // Inits the display root once the display is ready in |
| 166 // 'external window mode'. |
| 167 void InitDisplayRoot(); |
| 168 |
| 169 // Inits the necessary WindowManager state once the display is ready. |
166 void InitWindowManagerDisplayRoots(); | 170 void InitWindowManagerDisplayRoots(); |
167 | 171 |
168 // Creates the set of WindowManagerDisplayRoots from the | 172 // Creates the set of WindowManagerDisplayRoots from the |
169 // WindowManagerWindowTreeFactorySet. | 173 // WindowManagerWindowTreeFactorySet. |
170 void CreateWindowManagerDisplayRootsFromFactories(); | 174 void CreateWindowManagerDisplayRootsFromFactories(); |
171 | 175 |
172 void CreateWindowManagerDisplayRootFromFactory( | 176 void CreateWindowManagerDisplayRootFromFactory( |
173 WindowManagerWindowTreeFactory* factory); | 177 WindowManagerWindowTreeFactory* factory); |
174 | 178 |
175 // Creates the root ServerWindow for this display, where |size| is in physical | 179 // Creates the root ServerWindow for this display, where |size| is in physical |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 | 216 |
213 // The last cursor set. Used to track whether we need to change the cursor. | 217 // The last cursor set. Used to track whether we need to change the cursor. |
214 mojom::Cursor last_cursor_; | 218 mojom::Cursor last_cursor_; |
215 | 219 |
216 ServerWindowTracker activation_parents_; | 220 ServerWindowTracker activation_parents_; |
217 | 221 |
218 cc::LocalSurfaceIdAllocator allocator_; | 222 cc::LocalSurfaceIdAllocator allocator_; |
219 | 223 |
220 WindowManagerDisplayRootMap window_manager_display_root_map_; | 224 WindowManagerDisplayRootMap window_manager_display_root_map_; |
221 | 225 |
| 226 std::unique_ptr<WindowManagerDisplayRoot> external_mode_root_; |
| 227 |
222 DISALLOW_COPY_AND_ASSIGN(Display); | 228 DISALLOW_COPY_AND_ASSIGN(Display); |
223 }; | 229 }; |
224 | 230 |
225 } // namespace ws | 231 } // namespace ws |
226 } // namespace ui | 232 } // namespace ui |
227 | 233 |
228 #endif // SERVICES_UI_WS_DISPLAY_H_ | 234 #endif // SERVICES_UI_WS_DISPLAY_H_ |
OLD | NEW |