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 "chrome/browser/chromeos/arc/arc_service_launcher.h" | 5 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h" | 24 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h" |
25 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h
" | 25 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h
" |
26 #include "chrome/browser/chromeos/arc/notification/arc_provision_notification_se
rvice.h" | 26 #include "chrome/browser/chromeos/arc/notification/arc_provision_notification_se
rvice.h" |
27 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" | 27 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" |
28 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h" | 28 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h" |
29 #include "chrome/browser/chromeos/arc/print/arc_print_service.h" | 29 #include "chrome/browser/chromeos/arc/print/arc_print_service.h" |
30 #include "chrome/browser/chromeos/arc/process/arc_process_service.h" | 30 #include "chrome/browser/chromeos/arc/process/arc_process_service.h" |
31 #include "chrome/browser/chromeos/arc/tracing/arc_tracing_bridge.h" | 31 #include "chrome/browser/chromeos/arc/tracing/arc_tracing_bridge.h" |
32 #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h" | 32 #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h" |
33 #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h" | 33 #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h" |
| 34 #include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_ar
c_home_service.h" |
34 #include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_fr
amework_service.h" | 35 #include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_fr
amework_service.h" |
35 #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h" | 36 #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h" |
36 #include "chrome/browser/profiles/profile.h" | 37 #include "chrome/browser/profiles/profile.h" |
37 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | 38 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
38 #include "components/arc/arc_service_manager.h" | 39 #include "components/arc/arc_service_manager.h" |
39 #include "components/arc/arc_session.h" | 40 #include "components/arc/arc_session.h" |
40 #include "components/arc/arc_session_runner.h" | 41 #include "components/arc/arc_session_runner.h" |
41 #include "components/arc/audio/arc_audio_bridge.h" | 42 #include "components/arc/audio/arc_audio_bridge.h" |
42 #include "components/arc/bluetooth/arc_bluetooth_bridge.h" | 43 #include "components/arc/bluetooth/arc_bluetooth_bridge.h" |
43 #include "components/arc/clipboard/arc_clipboard_bridge.h" | 44 #include "components/arc/clipboard/arc_clipboard_bridge.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 arc_service_manager_->AddService( | 141 arc_service_manager_->AddService( |
141 base::MakeUnique<ArcStorageManager>(arc_bridge_service)); | 142 base::MakeUnique<ArcStorageManager>(arc_bridge_service)); |
142 arc_service_manager_->AddService( | 143 arc_service_manager_->AddService( |
143 base::MakeUnique<ArcTracingBridge>(arc_bridge_service)); | 144 base::MakeUnique<ArcTracingBridge>(arc_bridge_service)); |
144 arc_service_manager_->AddService( | 145 arc_service_manager_->AddService( |
145 base::MakeUnique<ArcTtsService>(arc_bridge_service)); | 146 base::MakeUnique<ArcTtsService>(arc_bridge_service)); |
146 if (ArcVoiceInteractionFrameworkService::IsVoiceInteractionEnabled()) { | 147 if (ArcVoiceInteractionFrameworkService::IsVoiceInteractionEnabled()) { |
147 arc_service_manager_->AddService( | 148 arc_service_manager_->AddService( |
148 base::MakeUnique<ArcVoiceInteractionFrameworkService>( | 149 base::MakeUnique<ArcVoiceInteractionFrameworkService>( |
149 arc_bridge_service)); | 150 arc_bridge_service)); |
| 151 arc_service_manager_->AddService( |
| 152 base::MakeUnique<ArcVoiceInteractionArcHomeService>( |
| 153 arc_bridge_service)); |
150 } | 154 } |
151 arc_service_manager_->AddService( | 155 arc_service_manager_->AddService( |
152 base::MakeUnique<ArcWallpaperService>(arc_bridge_service)); | 156 base::MakeUnique<ArcWallpaperService>(arc_bridge_service)); |
153 arc_service_manager_->AddService( | 157 arc_service_manager_->AddService( |
154 base::MakeUnique<GpuArcVideoServiceHost>(arc_bridge_service)); | 158 base::MakeUnique<GpuArcVideoServiceHost>(arc_bridge_service)); |
155 } | 159 } |
156 | 160 |
157 void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) { | 161 void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) { |
158 DCHECK(arc_service_manager_); | 162 DCHECK(arc_service_manager_); |
159 DCHECK(arc_session_manager_); | 163 DCHECK(arc_session_manager_); |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 void ArcServiceLauncher::Shutdown() { | 209 void ArcServiceLauncher::Shutdown() { |
206 // Destroy in the reverse order of the initialization. | 210 // Destroy in the reverse order of the initialization. |
207 arc_play_store_enabled_preference_handler_.reset(); | 211 arc_play_store_enabled_preference_handler_.reset(); |
208 if (arc_service_manager_) | 212 if (arc_service_manager_) |
209 arc_service_manager_->Shutdown(); | 213 arc_service_manager_->Shutdown(); |
210 arc_session_manager_.reset(); | 214 arc_session_manager_.reset(); |
211 arc_service_manager_.reset(); | 215 arc_service_manager_.reset(); |
212 } | 216 } |
213 | 217 |
214 } // namespace arc | 218 } // namespace arc |
OLD | NEW |