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

Side by Side Diff: chrome/browser/chromeos/arc/arc_service_launcher.cc

Issue 2731403007: add voice interaction shortcut. (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" 5 #include "chrome/browser/chromeos/arc/arc_service_launcher.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/threading/sequenced_worker_pool.h" 12 #include "base/threading/sequenced_worker_pool.h"
13 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.h" 13 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.h"
14 #include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bri dge.h" 14 #include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bri dge.h"
15 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 15 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
16 #include "chrome/browser/chromeos/arc/arc_session_manager.h" 16 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
17 #include "chrome/browser/chromeos/arc/arc_util.h" 17 #include "chrome/browser/chromeos/arc/arc_util.h"
18 #include "chrome/browser/chromeos/arc/arc_voice_interaction_service.h"
18 #include "chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_ bridge.h" 19 #include "chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_ bridge.h"
19 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h" 20 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h"
20 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h" 21 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h"
21 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_mounter.h" 22 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_mounter.h"
22 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.h " 23 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.h "
23 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h" 24 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h"
24 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h " 25 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h "
25 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" 26 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
26 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h" 27 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h"
27 #include "chrome/browser/chromeos/arc/print/arc_print_service.h" 28 #include "chrome/browser/chromeos/arc/print/arc_print_service.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 base::MakeUnique<ArcPrintService>(arc_bridge_service)); 130 base::MakeUnique<ArcPrintService>(arc_bridge_service));
130 arc_service_manager_->AddService( 131 arc_service_manager_->AddService(
131 base::MakeUnique<ArcProcessService>(arc_bridge_service)); 132 base::MakeUnique<ArcProcessService>(arc_bridge_service));
132 arc_service_manager_->AddService( 133 arc_service_manager_->AddService(
133 base::MakeUnique<ArcSettingsService>(arc_bridge_service)); 134 base::MakeUnique<ArcSettingsService>(arc_bridge_service));
134 arc_service_manager_->AddService( 135 arc_service_manager_->AddService(
135 base::MakeUnique<ArcStorageManager>(arc_bridge_service)); 136 base::MakeUnique<ArcStorageManager>(arc_bridge_service));
136 arc_service_manager_->AddService( 137 arc_service_manager_->AddService(
137 base::MakeUnique<ArcTtsService>(arc_bridge_service)); 138 base::MakeUnique<ArcTtsService>(arc_bridge_service));
138 arc_service_manager_->AddService( 139 arc_service_manager_->AddService(
140 base::MakeUnique<ArcVoiceInteractionService>(arc_bridge_service));
141 arc_service_manager_->AddService(
139 base::MakeUnique<ArcWallpaperService>(arc_bridge_service)); 142 base::MakeUnique<ArcWallpaperService>(arc_bridge_service));
140 arc_service_manager_->AddService( 143 arc_service_manager_->AddService(
141 base::MakeUnique<GpuArcVideoServiceHost>(arc_bridge_service)); 144 base::MakeUnique<GpuArcVideoServiceHost>(arc_bridge_service));
142 } 145 }
143 146
144 void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) { 147 void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) {
145 DCHECK(arc_service_manager_); 148 DCHECK(arc_service_manager_);
146 DCHECK(arc_session_manager_); 149 DCHECK(arc_session_manager_);
147 // TODO(hidehiko): DCHECK(!arc_session_manager_->IsAllowed()) here. 150 // TODO(hidehiko): DCHECK(!arc_session_manager_->IsAllowed()) here.
148 // Do not expect it in real use case, but it is used for testing. 151 // Do not expect it in real use case, but it is used for testing.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 191
189 void ArcServiceLauncher::Shutdown() { 192 void ArcServiceLauncher::Shutdown() {
190 DCHECK(arc_service_manager_); 193 DCHECK(arc_service_manager_);
191 // Destroy in the reverse order of the initialization. 194 // Destroy in the reverse order of the initialization.
192 arc_service_manager_->Shutdown(); 195 arc_service_manager_->Shutdown();
193 arc_session_manager_.reset(); 196 arc_session_manager_.reset();
194 arc_service_manager_.reset(); 197 arc_service_manager_.reset();
195 } 198 }
196 199
197 } // namespace arc 200 } // namespace arc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698