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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 | 145 |
146 // Returns the root window of the active user. | 146 // Returns the root window of the active user. |
147 ServerWindow* GetActiveRootWindow(); | 147 ServerWindow* GetActiveRootWindow(); |
148 | 148 |
149 private: | 149 private: |
150 friend class test::DisplayTestApi; | 150 friend class test::DisplayTestApi; |
151 | 151 |
152 using WindowManagerDisplayRootMap = | 152 using WindowManagerDisplayRootMap = |
153 std::map<UserId, WindowManagerDisplayRoot*>; | 153 std::map<UserId, WindowManagerDisplayRoot*>; |
154 | 154 |
155 // Inits the necessary state once the display is ready. | 155 // Inits the display root once the display is ready in |
| 156 // 'external window mode'. |
| 157 void InitDisplayRoot(); |
| 158 |
| 159 // Inits the necessary WindowManager state once the display is ready. |
156 void InitWindowManagerDisplayRoots(); | 160 void InitWindowManagerDisplayRoots(); |
157 | 161 |
158 // Creates the set of WindowManagerDisplayRoots from the | 162 // Creates the set of WindowManagerDisplayRoots from the |
159 // WindowManagerWindowTreeFactorySet. | 163 // WindowManagerWindowTreeFactorySet. |
160 void CreateWindowManagerDisplayRootsFromFactories(); | 164 void CreateWindowManagerDisplayRootsFromFactories(); |
161 | 165 |
162 void CreateWindowManagerDisplayRootFromFactory( | 166 void CreateWindowManagerDisplayRootFromFactory( |
163 WindowManagerWindowTreeFactory* factory); | 167 WindowManagerWindowTreeFactory* factory); |
164 | 168 |
165 // Creates the root ServerWindow for this display, where |size| is in physical | 169 // Creates the root ServerWindow for this display, where |size| is in physical |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 std::unique_ptr<PlatformDisplay> platform_display_; | 201 std::unique_ptr<PlatformDisplay> platform_display_; |
198 std::unique_ptr<FocusController> focus_controller_; | 202 std::unique_ptr<FocusController> focus_controller_; |
199 | 203 |
200 // The last cursor set. Used to track whether we need to change the cursor. | 204 // The last cursor set. Used to track whether we need to change the cursor. |
201 mojom::Cursor last_cursor_; | 205 mojom::Cursor last_cursor_; |
202 | 206 |
203 ServerWindowTracker activation_parents_; | 207 ServerWindowTracker activation_parents_; |
204 | 208 |
205 WindowManagerDisplayRootMap window_manager_display_root_map_; | 209 WindowManagerDisplayRootMap window_manager_display_root_map_; |
206 | 210 |
| 211 std::unique_ptr<WindowManagerDisplayRoot> external_window_mode_display_root_; |
| 212 |
| 213 bool in_external_window_mode_ = false; |
| 214 |
207 DISALLOW_COPY_AND_ASSIGN(Display); | 215 DISALLOW_COPY_AND_ASSIGN(Display); |
208 }; | 216 }; |
209 | 217 |
210 } // namespace ws | 218 } // namespace ws |
211 } // namespace ui | 219 } // namespace ui |
212 | 220 |
213 #endif // SERVICES_UI_WS_DISPLAY_H_ | 221 #endif // SERVICES_UI_WS_DISPLAY_H_ |
OLD | NEW |