Reland: add voice interaction shortcut.

chrome/browser/chromeos/arc/arc_service_launcher.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/arc/arc_service_launcher.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.h"
 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h"
 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h"
 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h"
 #include "chrome/browser/chromeos/arc/print/arc_print_service.h"
 #include "chrome/browser/chromeos/arc/process/arc_process_service.h"
 #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 "components/arc/arc_service_manager.h"
 #include "components/arc/arc_session.h"
 #include "components/arc/arc_session_runner.h"
 #include "components/arc/audio/arc_audio_bridge.h"
 #include "components/arc/bluetooth/arc_bluetooth_bridge.h"
 #include "components/arc/clipboard/arc_clipboard_bridge.h"
 #include "components/arc/crash_collector/arc_crash_collector_bridge.h"
@@ skipping 89 matching lines @@
   arc_service_manager_->AddService(
       base::MakeUnique<ArcProcessService>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcSettingsService>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcStorageManager>(arc_bridge_service));
   arc_service_manager_->AddService(
       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(
       base::MakeUnique<GpuArcVideoServiceHost>(arc_bridge_service));
 }
 
 void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) {
   DCHECK(arc_service_manager_);
   DCHECK(arc_session_manager_);
   // TODO(hidehiko): DCHECK(!arc_session_manager_->IsAllowed()) here.
@@ skipping 44 matching lines @@
 void ArcServiceLauncher::Shutdown() {
   // Destroy in the reverse order of the initialization.
   arc_play_store_enabled_preference_handler_.reset();
   if (arc_service_manager_)
     arc_service_manager_->Shutdown();
   arc_session_manager_.reset();
   arc_service_manager_.reset();
 }
 
 }  // namespace arc