Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Side by Side Diff: chrome/browser/chromeos/arc/arc_service_launcher.cc

Issue 2768093005: Send voice interaction structure from cros to Arc. (Closed)
Patch Set: address review comments Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 12 matching lines...) Expand all
23 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.h " 23 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.h "
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/policy/arc_policy_bridge.h" 26 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
27 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h" 27 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h"
28 #include "chrome/browser/chromeos/arc/print/arc_print_service.h" 28 #include "chrome/browser/chromeos/arc/print/arc_print_service.h"
29 #include "chrome/browser/chromeos/arc/process/arc_process_service.h" 29 #include "chrome/browser/chromeos/arc/process/arc_process_service.h"
30 #include "chrome/browser/chromeos/arc/tracing/arc_tracing_bridge.h" 30 #include "chrome/browser/chromeos/arc/tracing/arc_tracing_bridge.h"
31 #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h" 31 #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h"
32 #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h" 32 #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h"
33 #include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_ar c_home_service.h"
33 #include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_fr amework_service.h" 34 #include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_fr amework_service.h"
34 #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h" 35 #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h"
35 #include "chrome/browser/profiles/profile.h" 36 #include "chrome/browser/profiles/profile.h"
36 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 37 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
37 #include "components/arc/arc_service_manager.h" 38 #include "components/arc/arc_service_manager.h"
38 #include "components/arc/arc_session.h" 39 #include "components/arc/arc_session.h"
39 #include "components/arc/arc_session_runner.h" 40 #include "components/arc/arc_session_runner.h"
40 #include "components/arc/audio/arc_audio_bridge.h" 41 #include "components/arc/audio/arc_audio_bridge.h"
41 #include "components/arc/bluetooth/arc_bluetooth_bridge.h" 42 #include "components/arc/bluetooth/arc_bluetooth_bridge.h"
42 #include "components/arc/clipboard/arc_clipboard_bridge.h" 43 #include "components/arc/clipboard/arc_clipboard_bridge.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 arc_service_manager_->AddService( 138 arc_service_manager_->AddService(
138 base::MakeUnique<ArcStorageManager>(arc_bridge_service)); 139 base::MakeUnique<ArcStorageManager>(arc_bridge_service));
139 arc_service_manager_->AddService( 140 arc_service_manager_->AddService(
140 base::MakeUnique<ArcTracingBridge>(arc_bridge_service)); 141 base::MakeUnique<ArcTracingBridge>(arc_bridge_service));
141 arc_service_manager_->AddService( 142 arc_service_manager_->AddService(
142 base::MakeUnique<ArcTtsService>(arc_bridge_service)); 143 base::MakeUnique<ArcTtsService>(arc_bridge_service));
143 if (ArcVoiceInteractionFrameworkService::IsVoiceInteractionEnabled()) { 144 if (ArcVoiceInteractionFrameworkService::IsVoiceInteractionEnabled()) {
144 arc_service_manager_->AddService( 145 arc_service_manager_->AddService(
145 base::MakeUnique<ArcVoiceInteractionFrameworkService>( 146 base::MakeUnique<ArcVoiceInteractionFrameworkService>(
146 arc_bridge_service)); 147 arc_bridge_service));
148 arc_service_manager_->AddService(
149 base::MakeUnique<ArcVoiceInteractionArcHomeService>(
150 arc_bridge_service));
147 } 151 }
148 arc_service_manager_->AddService( 152 arc_service_manager_->AddService(
149 base::MakeUnique<ArcWallpaperService>(arc_bridge_service)); 153 base::MakeUnique<ArcWallpaperService>(arc_bridge_service));
150 arc_service_manager_->AddService( 154 arc_service_manager_->AddService(
151 base::MakeUnique<GpuArcVideoServiceHost>(arc_bridge_service)); 155 base::MakeUnique<GpuArcVideoServiceHost>(arc_bridge_service));
152 } 156 }
153 157
154 void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) { 158 void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) {
155 DCHECK(arc_service_manager_); 159 DCHECK(arc_service_manager_);
156 DCHECK(arc_session_manager_); 160 DCHECK(arc_session_manager_);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 void ArcServiceLauncher::Shutdown() { 206 void ArcServiceLauncher::Shutdown() {
203 // Destroy in the reverse order of the initialization. 207 // Destroy in the reverse order of the initialization.
204 arc_play_store_enabled_preference_handler_.reset(); 208 arc_play_store_enabled_preference_handler_.reset();
205 if (arc_service_manager_) 209 if (arc_service_manager_)
206 arc_service_manager_->Shutdown(); 210 arc_service_manager_->Shutdown();
207 arc_session_manager_.reset(); 211 arc_session_manager_.reset();
208 arc_service_manager_.reset(); 212 arc_service_manager_.reset();
209 } 213 }
210 214
211 } // namespace arc 215 } // namespace arc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698