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