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 "mash/wm/window_manager_application.h" | 5 #include "mash/wm/window_manager_application.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
11 #include "components/mus/common/event_matcher_util.h" | 11 #include "components/mus/common/event_matcher_util.h" |
12 #include "components/mus/public/cpp/window.h" | 12 #include "components/mus/public/cpp/window.h" |
13 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" | 13 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" |
14 #include "mash/wm/accelerator_registrar_impl.h" | 14 #include "mash/wm/accelerator_registrar_impl.h" |
15 #include "mash/wm/bridge/wm_globals_mus.h" | 15 #include "mash/wm/bridge/wm_globals_mus.h" |
16 #include "mash/wm/bridge/wm_lookup_mus.h" | 16 #include "mash/wm/bridge/wm_lookup_mus.h" |
17 #include "mash/wm/root_window_controller.h" | 17 #include "mash/wm/root_window_controller.h" |
18 #include "mash/wm/root_windows_observer.h" | 18 #include "mash/wm/root_windows_observer.h" |
19 #include "mash/wm/shelf_layout_impl.h" | 19 #include "mash/wm/shelf_layout_impl.h" |
20 #include "mash/wm/user_window_controller_impl.h" | 20 #include "mash/wm/user_window_controller_impl.h" |
21 #include "mojo/converters/input_events/input_events_type_converters.h" | |
22 #include "services/shell/public/cpp/connection.h" | 21 #include "services/shell/public/cpp/connection.h" |
23 #include "services/shell/public/cpp/connector.h" | 22 #include "services/shell/public/cpp/connector.h" |
24 #include "services/tracing/public/cpp/tracing_impl.h" | 23 #include "services/tracing/public/cpp/tracing_impl.h" |
25 #include "ui/events/event.h" | 24 #include "ui/events/event.h" |
| 25 #include "ui/events/mojo/input_events_type_converters.h" |
26 #include "ui/views/mus/aura_init.h" | 26 #include "ui/views/mus/aura_init.h" |
27 #include "ui/views/mus/screen_mus.h" | 27 #include "ui/views/mus/screen_mus.h" |
28 | 28 |
29 namespace mash { | 29 namespace mash { |
30 namespace wm { | 30 namespace wm { |
31 | 31 |
32 WindowManagerApplication::WindowManagerApplication() | 32 WindowManagerApplication::WindowManagerApplication() |
33 : connector_(nullptr), window_manager_factory_binding_(this) {} | 33 : connector_(nullptr), window_manager_factory_binding_(this) {} |
34 | 34 |
35 WindowManagerApplication::~WindowManagerApplication() { | 35 WindowManagerApplication::~WindowManagerApplication() { |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 | 198 |
199 void WindowManagerApplication::CreateWindowManager( | 199 void WindowManagerApplication::CreateWindowManager( |
200 mus::mojom::DisplayPtr display, | 200 mus::mojom::DisplayPtr display, |
201 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) { | 201 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) { |
202 AddRootWindowController(RootWindowController::CreateFromDisplay( | 202 AddRootWindowController(RootWindowController::CreateFromDisplay( |
203 this, std::move(display), std::move(client_request))); | 203 this, std::move(display), std::move(client_request))); |
204 } | 204 } |
205 | 205 |
206 } // namespace wm | 206 } // namespace wm |
207 } // namespace mash | 207 } // namespace mash |
OLD | NEW |