| 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_handler/tray_action_handler_controller.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/binder_registry.h" | 25 #include "services/service_manager/public/cpp/binder_registry.h" |
| 25 #include "ui/app_list/presenter/app_list.h" | 26 #include "ui/app_list/presenter/app_list.h" |
| 26 | 27 |
| 27 namespace ash { | 28 namespace ash { |
| 28 | 29 |
| 29 namespace { | 30 namespace { |
| 30 | 31 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 } | 73 } |
| 73 | 74 |
| 74 void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) { | 75 void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) { |
| 75 Shell::Get()->system_tray_controller()->BindRequest(std::move(request)); | 76 Shell::Get()->system_tray_controller()->BindRequest(std::move(request)); |
| 76 } | 77 } |
| 77 | 78 |
| 78 void BindTouchViewRequestOnMainThread(mojom::TouchViewManagerRequest request) { | 79 void BindTouchViewRequestOnMainThread(mojom::TouchViewManagerRequest request) { |
| 79 Shell::Get()->maximize_mode_controller()->BindRequest(std::move(request)); | 80 Shell::Get()->maximize_mode_controller()->BindRequest(std::move(request)); |
| 80 } | 81 } |
| 81 | 82 |
| 83 void BindTrayActionHandlerControllerRequestOnMainThread( |
| 84 mojom::TrayActionHandlerControllerRequest request) { |
| 85 Shell::Get()->tray_action_handler_controller()->BindRequest( |
| 86 std::move(request)); |
| 87 } |
| 88 |
| 82 void BindVpnListRequestOnMainThread(mojom::VpnListRequest request) { | 89 void BindVpnListRequestOnMainThread(mojom::VpnListRequest request) { |
| 83 Shell::Get()->vpn_list()->BindRequest(std::move(request)); | 90 Shell::Get()->vpn_list()->BindRequest(std::move(request)); |
| 84 } | 91 } |
| 85 | 92 |
| 86 void BindWallpaperRequestOnMainThread( | 93 void BindWallpaperRequestOnMainThread( |
| 87 mojom::WallpaperControllerRequest request) { | 94 mojom::WallpaperControllerRequest request) { |
| 88 Shell::Get()->wallpaper_controller()->BindRequest(std::move(request)); | 95 Shell::Get()->wallpaper_controller()->BindRequest(std::move(request)); |
| 89 } | 96 } |
| 90 | 97 |
| 91 } // namespace | 98 } // namespace |
| (...skipping 21 matching lines...) Expand all Loading... |
| 113 registry->AddInterface(base::Bind(&BindSessionControllerRequestOnMainThread), | 120 registry->AddInterface(base::Bind(&BindSessionControllerRequestOnMainThread), |
| 114 main_thread_task_runner); | 121 main_thread_task_runner); |
| 115 registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread), | 122 registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread), |
| 116 main_thread_task_runner); | 123 main_thread_task_runner); |
| 117 registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread), | 124 registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread), |
| 118 main_thread_task_runner); | 125 main_thread_task_runner); |
| 119 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), | 126 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), |
| 120 main_thread_task_runner); | 127 main_thread_task_runner); |
| 121 registry->AddInterface(base::Bind(&BindTouchViewRequestOnMainThread), | 128 registry->AddInterface(base::Bind(&BindTouchViewRequestOnMainThread), |
| 122 main_thread_task_runner); | 129 main_thread_task_runner); |
| 130 registry->AddInterface( |
| 131 base::Bind(&BindTrayActionHandlerControllerRequestOnMainThread), |
| 132 main_thread_task_runner); |
| 123 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), | 133 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), |
| 124 main_thread_task_runner); | 134 main_thread_task_runner); |
| 125 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), | 135 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), |
| 126 main_thread_task_runner); | 136 main_thread_task_runner); |
| 127 } | 137 } |
| 128 | 138 |
| 129 } // namespace mojo_interface_factory | 139 } // namespace mojo_interface_factory |
| 130 | 140 |
| 131 } // namespace ash | 141 } // namespace ash |
| OLD | NEW |