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

Unified Diff: chrome/browser/chromeos/arc/arc_service_launcher.cc

Issue 2731403007: add voice interaction shortcut. (Closed)
Patch Set: addressed review comments Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
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..989eb10980929d2335a6e26ea1e47b0d5a926b98 100644
--- a/chrome/browser/chromeos/arc/arc_service_launcher.cc
+++ b/chrome/browser/chromeos/arc/arc_service_launcher.cc
@@ -30,6 +30,7 @@
#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"
@@ -139,6 +140,11 @@ void ArcServiceLauncher::Initialize() {
base::MakeUnique<ArcTracingBridge>(arc_bridge_service));
arc_service_manager_->AddService(
base::MakeUnique<ArcTtsService>(arc_bridge_service));
+ if (ArcVoiceInteractionFrameworkService::IsVoiceInteractionEnabled()) {
+ arc_service_manager_->AddService(
+ base::MakeUnique<ArcVoiceInteractionFrameworkService>(
+ arc_bridge_service));
+ }
arc_service_manager_->AddService(
base::MakeUnique<ArcWallpaperService>(arc_bridge_service));
arc_service_manager_->AddService(

Powered by Google App Engine
This is Rietveld 408576698