| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/mojo_interface_factory.h" | 5 #include "ash/mojo_interface_factory.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
| 10 #include "ash/cast_config_controller.h" | 10 #include "ash/cast_config_controller.h" |
| 11 #include "ash/media_controller.h" | 11 #include "ash/media_controller.h" |
| 12 #include "ash/new_window_controller.h" | 12 #include "ash/new_window_controller.h" |
| 13 #include "ash/session/session_controller.h" | 13 #include "ash/session/session_controller.h" |
| 14 #include "ash/shelf/shelf_controller.h" | 14 #include "ash/shelf/shelf_controller.h" |
| 15 #include "ash/shell.h" | 15 #include "ash/shell.h" |
| 16 #include "ash/shell_delegate.h" | 16 #include "ash/shell_delegate.h" |
| 17 #include "ash/shutdown_controller.h" | 17 #include "ash/shutdown_controller.h" |
| 18 #include "ash/system/locale/locale_notification_controller.h" | 18 #include "ash/system/locale/locale_notification_controller.h" |
| 19 #include "ash/system/network/vpn_list.h" | 19 #include "ash/system/network/vpn_list.h" |
| 20 #include "ash/system/tray/system_tray_controller.h" | 20 #include "ash/system/tray/system_tray_controller.h" |
| 21 #include "ash/tray_action/tray_action.h" | 21 #include "ash/tray_action/tray_action.h" |
| 22 #include "ash/wallpaper/wallpaper_controller.h" | 22 #include "ash/wallpaper/wallpaper_controller.h" |
| 23 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 23 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
| 24 #include "base/bind.h" | 24 #include "base/bind.h" |
| 25 #include "base/single_thread_task_runner.h" |
| 25 #include "services/service_manager/public/cpp/bind_source_info.h" | 26 #include "services/service_manager/public/cpp/bind_source_info.h" |
| 26 #include "services/service_manager/public/cpp/binder_registry.h" | 27 #include "services/service_manager/public/cpp/binder_registry.h" |
| 27 #include "ui/app_list/presenter/app_list.h" | 28 #include "ui/app_list/presenter/app_list.h" |
| 28 | 29 |
| 29 namespace ash { | 30 namespace ash { |
| 30 | 31 |
| 31 namespace { | 32 namespace { |
| 32 | 33 |
| 33 void BindAcceleratorControllerRequestOnMainThread( | 34 void BindAcceleratorControllerRequestOnMainThread( |
| 34 const service_manager::BindSourceInfo& source_info, | 35 const service_manager::BindSourceInfo& source_info, |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 main_thread_task_runner); | 152 main_thread_task_runner); |
| 152 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), | 153 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), |
| 153 main_thread_task_runner); | 154 main_thread_task_runner); |
| 154 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), | 155 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), |
| 155 main_thread_task_runner); | 156 main_thread_task_runner); |
| 156 } | 157 } |
| 157 | 158 |
| 158 } // namespace mojo_interface_factory | 159 } // namespace mojo_interface_factory |
| 159 | 160 |
| 160 } // namespace ash | 161 } // namespace ash |
| OLD | NEW |