| 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 void AddActivationParent(ServerWindow* window); | 138 void AddActivationParent(ServerWindow* window); |
| 139 void RemoveActivationParent(ServerWindow* window); | 139 void RemoveActivationParent(ServerWindow* window); |
| 140 | 140 |
| 141 void UpdateTextInputState(ServerWindow* window, | 141 void UpdateTextInputState(ServerWindow* window, |
| 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 void UpdateNativeCursor(int32_t cursor_id); | 148 void UpdateNativeCursor(mojom::Cursor cursor_id); |
| 149 | 149 |
| 150 // mojom::WindowTreeHost: | 150 // mojom::WindowTreeHost: |
| 151 void SetSize(const gfx::Size& size) override; | 151 void SetSize(const gfx::Size& size) override; |
| 152 void SetTitle(const mojo::String& title) override; | 152 void SetTitle(const mojo::String& title) override; |
| 153 | 153 |
| 154 private: | 154 private: |
| 155 friend class test::DisplayTestApi; | 155 friend class test::DisplayTestApi; |
| 156 | 156 |
| 157 using WindowManagerDisplayRootMap = | 157 using WindowManagerDisplayRootMap = |
| 158 std::map<UserId, WindowManagerDisplayRoot*>; | 158 std::map<UserId, WindowManagerDisplayRoot*>; |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 | 199 |
| 200 std::unique_ptr<DisplayBinding> binding_; | 200 std::unique_ptr<DisplayBinding> binding_; |
| 201 // Set once Init() has been called. | 201 // Set once Init() has been called. |
| 202 bool init_called_ = false; | 202 bool init_called_ = false; |
| 203 WindowServer* const window_server_; | 203 WindowServer* const window_server_; |
| 204 std::unique_ptr<ServerWindow> root_; | 204 std::unique_ptr<ServerWindow> root_; |
| 205 std::unique_ptr<PlatformDisplay> platform_display_; | 205 std::unique_ptr<PlatformDisplay> platform_display_; |
| 206 std::unique_ptr<FocusController> focus_controller_; | 206 std::unique_ptr<FocusController> focus_controller_; |
| 207 | 207 |
| 208 // The last cursor set. Used to track whether we need to change the cursor. | 208 // The last cursor set. Used to track whether we need to change the cursor. |
| 209 int32_t last_cursor_; | 209 mojom::Cursor last_cursor_; |
| 210 | 210 |
| 211 ServerWindowTracker activation_parents_; | 211 ServerWindowTracker activation_parents_; |
| 212 | 212 |
| 213 // Set of windows with surfaces that need to be destroyed once the frame | 213 // Set of windows with surfaces that need to be destroyed once the frame |
| 214 // draws. | 214 // draws. |
| 215 std::set<ServerWindow*> windows_needing_frame_destruction_; | 215 std::set<ServerWindow*> windows_needing_frame_destruction_; |
| 216 | 216 |
| 217 WindowManagerDisplayRootMap window_manager_display_root_map_; | 217 WindowManagerDisplayRootMap window_manager_display_root_map_; |
| 218 | 218 |
| 219 DISALLOW_COPY_AND_ASSIGN(Display); | 219 DISALLOW_COPY_AND_ASSIGN(Display); |
| 220 }; | 220 }; |
| 221 | 221 |
| 222 } // namespace ws | 222 } // namespace ws |
| 223 } // namespace ui | 223 } // namespace ui |
| 224 | 224 |
| 225 #endif // SERVICES_UI_WS_DISPLAY_H_ | 225 #endif // SERVICES_UI_WS_DISPLAY_H_ |
| OLD | NEW |