| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "services/ui/ws/window_manager_display_root.h" | 5 #include "services/ui/ws/window_manager_display_root.h" |
| 6 | 6 |
| 7 #include "services/ui/ws/display_manager.h" | 7 #include "services/ui/ws/display_manager.h" |
| 8 #include "services/ui/ws/server_window.h" | 8 #include "services/ui/ws/server_window.h" |
| 9 #include "services/ui/ws/window_server.h" | 9 #include "services/ui/ws/window_server.h" |
| 10 | 10 |
| 11 namespace ui { | 11 namespace ui { |
| 12 namespace ws { | 12 namespace ws { |
| 13 | 13 |
| 14 WindowManagerDisplayRoot::WindowManagerDisplayRoot(Display* display) | 14 WindowManagerDisplayRoot::WindowManagerDisplayRoot(Display* display) |
| 15 : display_(display) { | 15 : display_(display) { |
| 16 root_.reset(window_server()->CreateServerWindow( | 16 root_.reset(window_server()->CreateServerWindow( |
| 17 window_server()->display_manager()->GetAndAdvanceNextRootId(), | 17 window_server()->display_manager()->GetAndAdvanceNextRootId(), |
| 18 ServerWindow::Properties())); | 18 ServerWindow::Properties(), allocator_.GenerateId())); |
| 19 fprintf(stderr, ">>>WindowManagerDisplayRoot %d\n", |
| 20 WindowIdToTransportId(root_->id())); |
| 19 // Our root is always a child of the Display's root. Do this | 21 // Our root is always a child of the Display's root. Do this |
| 20 // before the WindowTree has been created so that the client doesn't get | 22 // before the WindowTree has been created so that the client doesn't get |
| 21 // notified of the add, bounds change and visibility change. | 23 // notified of the add, bounds change and visibility change. |
| 22 root_->SetBounds(gfx::Rect(display->root_window()->bounds().size())); | 24 root_->SetBounds(gfx::Rect(display->root_window()->bounds().size()), |
| 25 allocator_.GenerateId()); |
| 23 root_->SetVisible(true); | 26 root_->SetVisible(true); |
| 24 display->root_window()->Add(root_.get()); | 27 display->root_window()->Add(root_.get()); |
| 25 } | 28 } |
| 26 | 29 |
| 27 WindowManagerDisplayRoot::~WindowManagerDisplayRoot() {} | 30 WindowManagerDisplayRoot::~WindowManagerDisplayRoot() {} |
| 28 | 31 |
| 29 WindowServer* WindowManagerDisplayRoot::window_server() { | 32 WindowServer* WindowManagerDisplayRoot::window_server() { |
| 30 return display_->window_server(); | 33 return display_->window_server(); |
| 31 } | 34 } |
| 32 | 35 |
| 33 } // namespace ws | 36 } // namespace ws |
| 34 } // namespace ui | 37 } // namespace ui |
| OLD | NEW |