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 "components/mus/ws/display.h" | 5 #include "components/mus/ws/display.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/debug/debugger.h" | 10 #include "base/debug/debugger.h" |
11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
12 #include "components/mus/common/types.h" | 12 #include "components/mus/common/types.h" |
13 #include "components/mus/ws/display_binding.h" | 13 #include "components/mus/ws/display_binding.h" |
14 #include "components/mus/ws/display_manager.h" | 14 #include "components/mus/ws/display_manager.h" |
15 #include "components/mus/ws/focus_controller.h" | 15 #include "components/mus/ws/focus_controller.h" |
16 #include "components/mus/ws/platform_display.h" | 16 #include "components/mus/ws/platform_display.h" |
17 #include "components/mus/ws/platform_display_init_params.h" | 17 #include "components/mus/ws/platform_display_init_params.h" |
18 #include "components/mus/ws/window_manager_factory_service.h" | 18 #include "components/mus/ws/window_manager_factory_service.h" |
19 #include "components/mus/ws/window_manager_state.h" | 19 #include "components/mus/ws/window_manager_state.h" |
20 #include "components/mus/ws/window_server.h" | 20 #include "components/mus/ws/window_server.h" |
21 #include "components/mus/ws/window_server_delegate.h" | 21 #include "components/mus/ws/window_server_delegate.h" |
22 #include "components/mus/ws/window_tree.h" | 22 #include "components/mus/ws/window_tree.h" |
23 #include "components/mus/ws/window_tree_binding.h" | 23 #include "components/mus/ws/window_tree_binding.h" |
24 #include "mojo/common/common_type_converters.h" | 24 #include "mojo/common/common_type_converters.h" |
25 #include "mojo/converters/geometry/geometry_type_converters.h" | |
26 #include "services/shell/public/interfaces/connector.mojom.h" | 25 #include "services/shell/public/interfaces/connector.mojom.h" |
27 #include "ui/base/cursor/cursor.h" | 26 #include "ui/base/cursor/cursor.h" |
| 27 #include "ui/gfx/geometry/mojo/geometry_type_converters.h" |
28 | 28 |
29 namespace mus { | 29 namespace mus { |
30 namespace ws { | 30 namespace ws { |
31 | 31 |
32 Display::Display(WindowServer* window_server, | 32 Display::Display(WindowServer* window_server, |
33 const PlatformDisplayInitParams& platform_display_init_params) | 33 const PlatformDisplayInitParams& platform_display_init_params) |
34 : id_(window_server->display_manager()->GetAndAdvanceNextDisplayId()), | 34 : id_(window_server->display_manager()->GetAndAdvanceNextDisplayId()), |
35 window_server_(window_server), | 35 window_server_(window_server), |
36 platform_display_(PlatformDisplay::Create(platform_display_init_params)), | 36 platform_display_(PlatformDisplay::Create(platform_display_init_params)), |
37 last_cursor_(ui::kCursorNone) { | 37 last_cursor_(ui::kCursorNone) { |
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
460 DCHECK_EQ(0u, window_manager_state_map_.count(id)); | 460 DCHECK_EQ(0u, window_manager_state_map_.count(id)); |
461 } | 461 } |
462 | 462 |
463 void Display::OnWindowManagerFactorySet(WindowManagerFactoryService* service) { | 463 void Display::OnWindowManagerFactorySet(WindowManagerFactoryService* service) { |
464 if (!binding_) | 464 if (!binding_) |
465 CreateWindowManagerStateFromService(service); | 465 CreateWindowManagerStateFromService(service); |
466 } | 466 } |
467 | 467 |
468 } // namespace ws | 468 } // namespace ws |
469 } // namespace mus | 469 } // namespace mus |
OLD | NEW |