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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 const ui::TextInputState& state); | 142 const ui::TextInputState& state); |
143 void SetImeVisibility(ServerWindow* window, bool visible); | 143 void SetImeVisibility(ServerWindow* window, bool visible); |
144 | 144 |
145 // Called just before |tree| is destroyed. | 145 // Called just before |tree| is destroyed. |
146 void OnWillDestroyTree(WindowTree* tree); | 146 void OnWillDestroyTree(WindowTree* tree); |
147 | 147 |
148 // Removes |display_root| from internal maps. This called prior to | 148 // Removes |display_root| from internal maps. This called prior to |
149 // |display_root| being destroyed. | 149 // |display_root| being destroyed. |
150 void RemoveWindowManagerDisplayRoot(WindowManagerDisplayRoot* display_root); | 150 void RemoveWindowManagerDisplayRoot(WindowManagerDisplayRoot* display_root); |
151 | 151 |
152 void UpdateNativeCursor(mojom::CursorType cursor_id); | 152 void UpdateNativeCursor(const ui::CursorData& cursor); |
153 | 153 |
154 // mojom::WindowTreeHost: | 154 // mojom::WindowTreeHost: |
155 void SetSize(const gfx::Size& size) override; | 155 void SetSize(const gfx::Size& size) override; |
156 void SetTitle(const std::string& title) override; | 156 void SetTitle(const std::string& title) override; |
157 | 157 |
158 // Updates the size of display root ServerWindow and WM root ServerWindow(s). | 158 // Updates the size of display root ServerWindow and WM root ServerWindow(s). |
159 void OnViewportMetricsChanged(const display::ViewportMetrics& metrics); | 159 void OnViewportMetricsChanged(const display::ViewportMetrics& metrics); |
160 | 160 |
161 // Returns the root window of the active user. | 161 // Returns the root window of the active user. |
162 ServerWindow* GetActiveRootWindow(); | 162 ServerWindow* GetActiveRootWindow(); |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 WindowServer* const window_server_; | 212 WindowServer* const window_server_; |
213 std::unique_ptr<ServerWindow> root_; | 213 std::unique_ptr<ServerWindow> root_; |
214 std::unique_ptr<PlatformDisplay> platform_display_; | 214 std::unique_ptr<PlatformDisplay> platform_display_; |
215 std::unique_ptr<FocusController> focus_controller_; | 215 std::unique_ptr<FocusController> focus_controller_; |
216 | 216 |
217 // In internal window mode this contains information about the display. In | 217 // In internal window mode this contains information about the display. In |
218 // external window mode this will be invalid. | 218 // external window mode this will be invalid. |
219 display::Display display_; | 219 display::Display display_; |
220 | 220 |
221 // The last cursor set. Used to track whether we need to change the cursor. | 221 // The last cursor set. Used to track whether we need to change the cursor. |
222 mojom::CursorType last_cursor_; | 222 ui::CursorData last_cursor_; |
223 | 223 |
224 ServerWindowTracker activation_parents_; | 224 ServerWindowTracker activation_parents_; |
225 | 225 |
226 cc::LocalSurfaceIdAllocator allocator_; | 226 cc::LocalSurfaceIdAllocator allocator_; |
227 | 227 |
228 WindowManagerDisplayRootMap window_manager_display_root_map_; | 228 WindowManagerDisplayRootMap window_manager_display_root_map_; |
229 | 229 |
230 DISALLOW_COPY_AND_ASSIGN(Display); | 230 DISALLOW_COPY_AND_ASSIGN(Display); |
231 }; | 231 }; |
232 | 232 |
233 } // namespace ws | 233 } // namespace ws |
234 } // namespace ui | 234 } // namespace ui |
235 | 235 |
236 #endif // SERVICES_UI_WS_DISPLAY_H_ | 236 #endif // SERVICES_UI_WS_DISPLAY_H_ |
OLD | NEW |