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 336048cd72a8367da21a27f25f8ea1efa9370f88..073f87a89d8c7ee0c66b7315d94e3d7e610d363a 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" |
@@ -30,9 +31,11 @@ |
#include "chrome/browser/chromeos/arc/tracing/arc_tracing_bridge.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" |
@@ -139,6 +142,12 @@ void ArcServiceLauncher::Initialize() { |
base::MakeUnique<ArcTracingBridge>(arc_bridge_service)); |
arc_service_manager_->AddService( |
base::MakeUnique<ArcTtsService>(arc_bridge_service)); |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ chromeos::switches::kEnableVoiceInteraction)) { |
Luis Héctor Chávez
2017/03/17 21:56:02
nit: we prefer for a single class to have complete
Muyuan
2017/03/17 23:39:29
Done.
|
+ arc_service_manager_->AddService( |
+ base::MakeUnique<ArcVoiceInteractionFrameworkService>( |
+ arc_bridge_service)); |
+ } |
arc_service_manager_->AddService( |
base::MakeUnique<ArcWallpaperService>(arc_bridge_service)); |
arc_service_manager_->AddService( |