| 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/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
| 10 #include "ash/common/mojo_interface_factory.h" | 10 #include "ash/common/mojo_interface_factory.h" |
| 11 #include "ash/common/wm_shell.h" | 11 #include "ash/common/wm_shell.h" |
| 12 #include "ash/mus/window_manager.h" | 12 #include "ash/mus/window_manager.h" |
| 13 #include "base/bind.h" | 13 #include "base/bind.h" |
| 14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
| 15 #include "base/threading/thread_task_runner_handle.h" |
| 15 #include "services/service_manager/public/cpp/connection.h" | 16 #include "services/service_manager/public/cpp/connection.h" |
| 16 #include "services/service_manager/public/cpp/connector.h" | 17 #include "services/service_manager/public/cpp/connector.h" |
| 17 #include "services/service_manager/public/cpp/service_context.h" | 18 #include "services/service_manager/public/cpp/service_context.h" |
| 18 #include "services/tracing/public/cpp/provider.h" | 19 #include "services/tracing/public/cpp/provider.h" |
| 19 #include "services/ui/common/accelerator_util.h" | 20 #include "services/ui/common/accelerator_util.h" |
| 20 #include "services/ui/public/cpp/gpu/gpu.h" | 21 #include "services/ui/public/cpp/gpu/gpu.h" |
| 21 #include "ui/aura/env.h" | 22 #include "ui/aura/env.h" |
| 22 #include "ui/aura/mus/mus_context_factory.h" | 23 #include "ui/aura/mus/mus_context_factory.h" |
| 23 #include "ui/aura/mus/window_tree_client.h" | 24 #include "ui/aura/mus/window_tree_client.h" |
| 24 #include "ui/events/event.h" | 25 #include "ui/events/event.h" |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 const service_manager::ServiceInfo& remote_info, | 149 const service_manager::ServiceInfo& remote_info, |
| 149 service_manager::InterfaceRegistry* registry) { | 150 service_manager::InterfaceRegistry* registry) { |
| 150 // Register services used in both classic ash and mash. | 151 // Register services used in both classic ash and mash. |
| 151 mojo_interface_factory::RegisterInterfaces( | 152 mojo_interface_factory::RegisterInterfaces( |
| 152 registry, base::ThreadTaskRunnerHandle::Get()); | 153 registry, base::ThreadTaskRunnerHandle::Get()); |
| 153 return true; | 154 return true; |
| 154 } | 155 } |
| 155 | 156 |
| 156 } // namespace mus | 157 } // namespace mus |
| 157 } // namespace ash | 158 } // namespace ash |
| OLD | NEW |