| 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/wallpaper/wallpaper_controller.h" | 22 #include "ash/wallpaper/wallpaper_controller.h" |
| 22 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 23 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
| 23 #include "base/bind.h" | 24 #include "base/bind.h" |
| 24 #include "services/service_manager/public/cpp/bind_source_info.h" | 25 #include "services/service_manager/public/cpp/bind_source_info.h" |
| 25 #include "services/service_manager/public/cpp/binder_registry.h" | 26 #include "services/service_manager/public/cpp/binder_registry.h" |
| 26 #include "ui/app_list/presenter/app_list.h" | 27 #include "ui/app_list/presenter/app_list.h" |
| 27 | 28 |
| 28 namespace ash { | 29 namespace ash { |
| 29 | 30 |
| 30 namespace { | 31 namespace { |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 mojom::SystemTrayRequest request) { | 90 mojom::SystemTrayRequest request) { |
| 90 Shell::Get()->system_tray_controller()->BindRequest(std::move(request)); | 91 Shell::Get()->system_tray_controller()->BindRequest(std::move(request)); |
| 91 } | 92 } |
| 92 | 93 |
| 93 void BindTouchViewRequestOnMainThread( | 94 void BindTouchViewRequestOnMainThread( |
| 94 const service_manager::BindSourceInfo& source_info, | 95 const service_manager::BindSourceInfo& source_info, |
| 95 mojom::TouchViewManagerRequest request) { | 96 mojom::TouchViewManagerRequest request) { |
| 96 Shell::Get()->maximize_mode_controller()->BindRequest(std::move(request)); | 97 Shell::Get()->maximize_mode_controller()->BindRequest(std::move(request)); |
| 97 } | 98 } |
| 98 | 99 |
| 100 void BindTrayActionRequestOnMainThread( |
| 101 const service_manager::BindSourceInfo& source_info, |
| 102 mojom::TrayActionRequest request) { |
| 103 Shell::Get()->tray_action()->BindRequest(std::move(request)); |
| 104 } |
| 105 |
| 99 void BindVpnListRequestOnMainThread( | 106 void BindVpnListRequestOnMainThread( |
| 100 const service_manager::BindSourceInfo& source_info, | 107 const service_manager::BindSourceInfo& source_info, |
| 101 mojom::VpnListRequest request) { | 108 mojom::VpnListRequest request) { |
| 102 Shell::Get()->vpn_list()->BindRequest(std::move(request)); | 109 Shell::Get()->vpn_list()->BindRequest(std::move(request)); |
| 103 } | 110 } |
| 104 | 111 |
| 105 void BindWallpaperRequestOnMainThread( | 112 void BindWallpaperRequestOnMainThread( |
| 106 const service_manager::BindSourceInfo& source_info, | 113 const service_manager::BindSourceInfo& source_info, |
| 107 mojom::WallpaperControllerRequest request) { | 114 mojom::WallpaperControllerRequest request) { |
| 108 Shell::Get()->wallpaper_controller()->BindRequest(std::move(request)); | 115 Shell::Get()->wallpaper_controller()->BindRequest(std::move(request)); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 133 registry->AddInterface(base::Bind(&BindSessionControllerRequestOnMainThread), | 140 registry->AddInterface(base::Bind(&BindSessionControllerRequestOnMainThread), |
| 134 main_thread_task_runner); | 141 main_thread_task_runner); |
| 135 registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread), | 142 registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread), |
| 136 main_thread_task_runner); | 143 main_thread_task_runner); |
| 137 registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread), | 144 registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread), |
| 138 main_thread_task_runner); | 145 main_thread_task_runner); |
| 139 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), | 146 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), |
| 140 main_thread_task_runner); | 147 main_thread_task_runner); |
| 141 registry->AddInterface(base::Bind(&BindTouchViewRequestOnMainThread), | 148 registry->AddInterface(base::Bind(&BindTouchViewRequestOnMainThread), |
| 142 main_thread_task_runner); | 149 main_thread_task_runner); |
| 150 registry->AddInterface(base::Bind(&BindTrayActionRequestOnMainThread), |
| 151 main_thread_task_runner); |
| 143 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), | 152 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), |
| 144 main_thread_task_runner); | 153 main_thread_task_runner); |
| 145 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), | 154 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), |
| 146 main_thread_task_runner); | 155 main_thread_task_runner); |
| 147 } | 156 } |
| 148 | 157 |
| 149 } // namespace mojo_interface_factory | 158 } // namespace mojo_interface_factory |
| 150 | 159 |
| 151 } // namespace ash | 160 } // namespace ash |
| OLD | NEW |