| 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/mojo_interface_factory.h" | 9 #include "ash/mojo_interface_factory.h" |
| 10 #include "ash/common/wm_shell.h" | |
| 11 #include "ash/mus/network_connect_delegate_mus.h" | 10 #include "ash/mus/network_connect_delegate_mus.h" |
| 12 #include "ash/mus/window_manager.h" | 11 #include "ash/mus/window_manager.h" |
| 13 #include "ash/system/power/power_status.h" | 12 #include "ash/system/power/power_status.h" |
| 13 #include "ash/wm_shell.h" |
| 14 #include "base/bind.h" | 14 #include "base/bind.h" |
| 15 #include "base/memory/ptr_util.h" | 15 #include "base/memory/ptr_util.h" |
| 16 #include "base/threading/sequenced_worker_pool.h" | 16 #include "base/threading/sequenced_worker_pool.h" |
| 17 #include "base/threading/thread_task_runner_handle.h" | 17 #include "base/threading/thread_task_runner_handle.h" |
| 18 #include "chromeos/audio/cras_audio_handler.h" | 18 #include "chromeos/audio/cras_audio_handler.h" |
| 19 #include "chromeos/dbus/dbus_thread_manager.h" | 19 #include "chromeos/dbus/dbus_thread_manager.h" |
| 20 #include "chromeos/network/network_connect.h" | 20 #include "chromeos/network/network_connect.h" |
| 21 #include "chromeos/network/network_handler.h" | 21 #include "chromeos/network/network_handler.h" |
| 22 #include "chromeos/system/fake_statistics_provider.h" | 22 #include "chromeos/system/fake_statistics_provider.h" |
| 23 #include "device/bluetooth/bluetooth_adapter_factory.h" | 23 #include "device/bluetooth/bluetooth_adapter_factory.h" |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 const service_manager::ServiceInfo& remote_info, | 131 const service_manager::ServiceInfo& remote_info, |
| 132 service_manager::InterfaceRegistry* registry) { | 132 service_manager::InterfaceRegistry* registry) { |
| 133 // Register services used in both classic ash and mash. | 133 // Register services used in both classic ash and mash. |
| 134 mojo_interface_factory::RegisterInterfaces( | 134 mojo_interface_factory::RegisterInterfaces( |
| 135 registry, base::ThreadTaskRunnerHandle::Get()); | 135 registry, base::ThreadTaskRunnerHandle::Get()); |
| 136 return true; | 136 return true; |
| 137 } | 137 } |
| 138 | 138 |
| 139 } // namespace mus | 139 } // namespace mus |
| 140 } // namespace ash | 140 } // namespace ash |
| OLD | NEW |