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 #include "services/ui/ws/display.h" | 5 #include "services/ui/ws/display.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 if (!init_called_ || !root_) | 226 if (!init_called_ || !root_) |
227 return; | 227 return; |
228 | 228 |
229 display_manager()->OnDisplayAcceleratedWidgetAvailable(this); | 229 display_manager()->OnDisplayAcceleratedWidgetAvailable(this); |
230 if (binding_) { | 230 if (binding_) { |
231 std::unique_ptr<WindowManagerDisplayRoot> display_root_ptr( | 231 std::unique_ptr<WindowManagerDisplayRoot> display_root_ptr( |
232 new WindowManagerDisplayRoot(this)); | 232 new WindowManagerDisplayRoot(this)); |
233 WindowManagerDisplayRoot* display_root = display_root_ptr.get(); | 233 WindowManagerDisplayRoot* display_root = display_root_ptr.get(); |
234 // For this case we never create additional displays roots, so any | 234 // For this case we never create additional displays roots, so any |
235 // id works. | 235 // id works. |
236 window_manager_display_root_map_[shell::mojom::kRootUserID] = | 236 window_manager_display_root_map_[service_manager::mojom::kRootUserID] = |
237 display_root_ptr.get(); | 237 display_root_ptr.get(); |
238 WindowTree* window_tree = binding_->CreateWindowTree(display_root->root()); | 238 WindowTree* window_tree = binding_->CreateWindowTree(display_root->root()); |
239 display_root->window_manager_state_ = window_tree->window_manager_state(); | 239 display_root->window_manager_state_ = window_tree->window_manager_state(); |
240 window_tree->window_manager_state()->AddWindowManagerDisplayRoot( | 240 window_tree->window_manager_state()->AddWindowManagerDisplayRoot( |
241 std::move(display_root_ptr)); | 241 std::move(display_root_ptr)); |
242 } else { | 242 } else { |
243 CreateWindowManagerDisplayRootsFromFactories(); | 243 CreateWindowManagerDisplayRootsFromFactories(); |
244 } | 244 } |
245 display_manager()->OnDisplayUpdate(this); | 245 display_manager()->OnDisplayUpdate(this); |
246 } | 246 } |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
400 } | 400 } |
401 | 401 |
402 void Display::OnWindowManagerWindowTreeFactoryReady( | 402 void Display::OnWindowManagerWindowTreeFactoryReady( |
403 WindowManagerWindowTreeFactory* factory) { | 403 WindowManagerWindowTreeFactory* factory) { |
404 if (!binding_) | 404 if (!binding_) |
405 CreateWindowManagerDisplayRootFromFactory(factory); | 405 CreateWindowManagerDisplayRootFromFactory(factory); |
406 } | 406 } |
407 | 407 |
408 } // namespace ws | 408 } // namespace ws |
409 } // namespace ui | 409 } // namespace ui |
OLD | NEW |