| Index: chrome/browser/chromeos/arc/arc_service_launcher.cc
|
| diff --git a/chrome/browser/chromeos/arc/arc_service_launcher.cc b/chrome/browser/chromeos/arc/arc_service_launcher.cc
|
| index 0365cbb26fa1308638d39dd5481c2fa181dec9eb..341e2c2221674f5dc82a3cda4b915d373095154a 100644
|
| --- a/chrome/browser/chromeos/arc/arc_service_launcher.cc
|
| +++ b/chrome/browser/chromeos/arc/arc_service_launcher.cc
|
| @@ -7,6 +7,7 @@
|
| #include <utility>
|
|
|
| #include "base/bind.h"
|
| +#include "base/command_line.h"
|
| #include "base/logging.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/threading/sequenced_worker_pool.h"
|
| @@ -29,9 +30,11 @@
|
| #include "chrome/browser/chromeos/arc/process/arc_process_service.h"
|
| #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h"
|
| #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h"
|
| +#include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.h"
|
| #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
|
| +#include "chromeos/chromeos_switches.h"
|
| #include "components/arc/arc_service_manager.h"
|
| #include "components/arc/arc_session.h"
|
| #include "components/arc/arc_session_runner.h"
|
| @@ -136,6 +139,12 @@ void ArcServiceLauncher::Initialize() {
|
| base::MakeUnique<ArcStorageManager>(arc_bridge_service));
|
| arc_service_manager_->AddService(
|
| base::MakeUnique<ArcTtsService>(arc_bridge_service));
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + chromeos::switches::kEnableVoiceInteraction)) {
|
| + arc_service_manager_->AddService(
|
| + base::MakeUnique<ArcVoiceInteractionFrameworkService>(
|
| + arc_bridge_service));
|
| + }
|
| arc_service_manager_->AddService(
|
| base::MakeUnique<ArcWallpaperService>(arc_bridge_service));
|
| arc_service_manager_->AddService(
|
|
|