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/login/lock_screen_controller.h" |
11 #include "ash/media_controller.h" | 12 #include "ash/media_controller.h" |
12 #include "ash/new_window_controller.h" | 13 #include "ash/new_window_controller.h" |
13 #include "ash/session/session_controller.h" | 14 #include "ash/session/session_controller.h" |
14 #include "ash/shelf/shelf_controller.h" | 15 #include "ash/shelf/shelf_controller.h" |
15 #include "ash/shell.h" | 16 #include "ash/shell.h" |
16 #include "ash/shell_delegate.h" | 17 #include "ash/shell_delegate.h" |
17 #include "ash/shutdown_controller.h" | 18 #include "ash/shutdown_controller.h" |
18 #include "ash/system/locale/locale_notification_controller.h" | 19 #include "ash/system/locale/locale_notification_controller.h" |
19 #include "ash/system/network/vpn_list.h" | 20 #include "ash/system/network/vpn_list.h" |
20 #include "ash/system/tray/system_tray_controller.h" | 21 #include "ash/system/tray/system_tray_controller.h" |
(...skipping 28 matching lines...) Expand all Loading... |
49 Shell::Get()->cast_config()->BindRequest(std::move(request)); | 50 Shell::Get()->cast_config()->BindRequest(std::move(request)); |
50 } | 51 } |
51 | 52 |
52 void BindLocaleNotificationControllerOnMainThread( | 53 void BindLocaleNotificationControllerOnMainThread( |
53 const service_manager::BindSourceInfo& source_info, | 54 const service_manager::BindSourceInfo& source_info, |
54 mojom::LocaleNotificationControllerRequest request) { | 55 mojom::LocaleNotificationControllerRequest request) { |
55 Shell::Get()->locale_notification_controller()->BindRequest( | 56 Shell::Get()->locale_notification_controller()->BindRequest( |
56 std::move(request)); | 57 std::move(request)); |
57 } | 58 } |
58 | 59 |
| 60 void BindLockScreenRequestOnMainThread( |
| 61 const service_manager::BindSourceInfo& source_info, |
| 62 mojom::LockScreenRequest request) { |
| 63 Shell::Get()->lock_screen_controller()->BindRequest(std::move(request)); |
| 64 } |
| 65 |
59 void BindMediaControllerRequestOnMainThread( | 66 void BindMediaControllerRequestOnMainThread( |
60 const service_manager::BindSourceInfo& source_info, | 67 const service_manager::BindSourceInfo& source_info, |
61 mojom::MediaControllerRequest request) { | 68 mojom::MediaControllerRequest request) { |
62 Shell::Get()->media_controller()->BindRequest(std::move(request)); | 69 Shell::Get()->media_controller()->BindRequest(std::move(request)); |
63 } | 70 } |
64 | 71 |
65 void BindNewWindowControllerRequestOnMainThread( | 72 void BindNewWindowControllerRequestOnMainThread( |
66 const service_manager::BindSourceInfo& source_info, | 73 const service_manager::BindSourceInfo& source_info, |
67 mojom::NewWindowControllerRequest request) { | 74 mojom::NewWindowControllerRequest request) { |
68 Shell::Get()->new_window_controller()->BindRequest(std::move(request)); | 75 Shell::Get()->new_window_controller()->BindRequest(std::move(request)); |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 registry->AddInterface( | 133 registry->AddInterface( |
127 base::Bind(&BindAcceleratorControllerRequestOnMainThread), | 134 base::Bind(&BindAcceleratorControllerRequestOnMainThread), |
128 main_thread_task_runner); | 135 main_thread_task_runner); |
129 registry->AddInterface(base::Bind(&BindAppListRequestOnMainThread), | 136 registry->AddInterface(base::Bind(&BindAppListRequestOnMainThread), |
130 main_thread_task_runner); | 137 main_thread_task_runner); |
131 registry->AddInterface(base::Bind(&BindCastConfigOnMainThread), | 138 registry->AddInterface(base::Bind(&BindCastConfigOnMainThread), |
132 main_thread_task_runner); | 139 main_thread_task_runner); |
133 registry->AddInterface( | 140 registry->AddInterface( |
134 base::Bind(&BindLocaleNotificationControllerOnMainThread), | 141 base::Bind(&BindLocaleNotificationControllerOnMainThread), |
135 main_thread_task_runner); | 142 main_thread_task_runner); |
| 143 registry->AddInterface(base::Bind(&BindLockScreenRequestOnMainThread), |
| 144 main_thread_task_runner); |
136 registry->AddInterface(base::Bind(&BindMediaControllerRequestOnMainThread), | 145 registry->AddInterface(base::Bind(&BindMediaControllerRequestOnMainThread), |
137 main_thread_task_runner); | 146 main_thread_task_runner); |
138 registry->AddInterface( | 147 registry->AddInterface( |
139 base::Bind(&BindNewWindowControllerRequestOnMainThread), | 148 base::Bind(&BindNewWindowControllerRequestOnMainThread), |
140 main_thread_task_runner); | 149 main_thread_task_runner); |
141 registry->AddInterface(base::Bind(&BindSessionControllerRequestOnMainThread), | 150 registry->AddInterface(base::Bind(&BindSessionControllerRequestOnMainThread), |
142 main_thread_task_runner); | 151 main_thread_task_runner); |
143 registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread), | 152 registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread), |
144 main_thread_task_runner); | 153 main_thread_task_runner); |
145 registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread), | 154 registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread), |
146 main_thread_task_runner); | 155 main_thread_task_runner); |
147 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), | 156 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), |
148 main_thread_task_runner); | 157 main_thread_task_runner); |
149 registry->AddInterface(base::Bind(&BindTouchViewRequestOnMainThread), | 158 registry->AddInterface(base::Bind(&BindTouchViewRequestOnMainThread), |
150 main_thread_task_runner); | 159 main_thread_task_runner); |
151 registry->AddInterface(base::Bind(&BindTrayActionRequestOnMainThread), | 160 registry->AddInterface(base::Bind(&BindTrayActionRequestOnMainThread), |
152 main_thread_task_runner); | 161 main_thread_task_runner); |
153 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), | 162 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), |
154 main_thread_task_runner); | 163 main_thread_task_runner); |
155 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), | 164 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), |
156 main_thread_task_runner); | 165 main_thread_task_runner); |
157 } | 166 } |
158 | 167 |
159 } // namespace mojo_interface_factory | 168 } // namespace mojo_interface_factory |
160 | 169 |
161 } // namespace ash | 170 } // namespace ash |
OLD | NEW |