Chromium Code Reviews| Index: services/ui/ws/display.cc |
| diff --git a/services/ui/ws/display.cc b/services/ui/ws/display.cc |
| index f11f959aa50f8c5a9b92abd93162f39a2f22c028..240b1d576bb7e39568d67a63e2d348b0caef5025 100644 |
| --- a/services/ui/ws/display.cc |
| +++ b/services/ui/ws/display.cc |
| @@ -34,9 +34,13 @@ namespace ws { |
| Display::Display(WindowServer* window_server, |
| const PlatformDisplayInitParams& platform_display_init_params) |
| - : window_server_(window_server), |
| - platform_display_(PlatformDisplay::Create(platform_display_init_params)), |
| - last_cursor_(mojom::Cursor::CURSOR_NULL) { |
| + : window_server_(window_server), last_cursor_(mojom::Cursor::CURSOR_NULL) { |
| + CreateRootWindow(platform_display_init_params.metrics.bounds.size()); |
| + |
| + // Pass the display root ServerWindow id to PlatformDisplay. |
|
Fady Samuel
2016/10/26 14:33:45
nit: drop id.
kylechar
2016/10/26 14:58:59
Done.
|
| + PlatformDisplayInitParams param_copy = platform_display_init_params; |
| + param_copy.root_window = root_.get(); |
| + platform_display_.reset(PlatformDisplay::Create(param_copy)); |
| platform_display_->Init(this); |
| window_server_->window_manager_window_tree_factory_set()->AddObserver(this); |