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 |
| 11 #include "base/memory/ptr_util.h" |
11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
12 #include "mojo/common/common_type_converters.h" | 13 #include "mojo/common/common_type_converters.h" |
13 #include "services/service_manager/public/interfaces/connector.mojom.h" | 14 #include "services/service_manager/public/interfaces/connector.mojom.h" |
14 #include "services/ui/common/types.h" | 15 #include "services/ui/common/types.h" |
15 #include "services/ui/public/interfaces/cursor.mojom.h" | 16 #include "services/ui/public/interfaces/cursor.mojom.h" |
16 #include "services/ui/ws/display_binding.h" | 17 #include "services/ui/ws/display_binding.h" |
17 #include "services/ui/ws/display_manager.h" | 18 #include "services/ui/ws/display_manager.h" |
18 #include "services/ui/ws/focus_controller.h" | 19 #include "services/ui/ws/focus_controller.h" |
19 #include "services/ui/ws/platform_display.h" | 20 #include "services/ui/ws/platform_display.h" |
20 #include "services/ui/ws/platform_display_init_params.h" | 21 #include "services/ui/ws/platform_display_init_params.h" |
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
384 } | 385 } |
385 | 386 |
386 void Display::OnWindowManagerWindowTreeFactoryReady( | 387 void Display::OnWindowManagerWindowTreeFactoryReady( |
387 WindowManagerWindowTreeFactory* factory) { | 388 WindowManagerWindowTreeFactory* factory) { |
388 if (!binding_) | 389 if (!binding_) |
389 CreateWindowManagerDisplayRootFromFactory(factory); | 390 CreateWindowManagerDisplayRootFromFactory(factory); |
390 } | 391 } |
391 | 392 |
392 } // namespace ws | 393 } // namespace ws |
393 } // namespace ui | 394 } // namespace ui |
OLD | NEW |