chrome/browser/chromeos/arc/arc_service_launcher.cc - Issue 2731403007: add voice interaction shortcut.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2731403007: add voice interaction shortcut. (Closed)

Patch Set: rebased 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

« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.h » ('j') | chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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(