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

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

Issue 2731403007: add voice interaction shortcut. (Closed)
Patch Set: Updated docs for mojom fields; Changed coding according to 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 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_play_store_enabled_preference_handler. h" 16 #include "chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler. h"
17 #include "chrome/browser/chromeos/arc/arc_session_manager.h" 17 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
18 #include "chrome/browser/chromeos/arc/arc_util.h" 18 #include "chrome/browser/chromeos/arc/arc_util.h"
19 #include "chrome/browser/chromeos/arc/arc_voice_interaction_service.h"
19 #include "chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_ bridge.h" 20 #include "chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_ bridge.h"
20 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h" 21 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h"
21 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h" 22 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h"
22 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_mounter.h" 23 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_mounter.h"
23 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.h " 24 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.h "
24 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h" 25 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h"
25 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h " 26 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h "
26 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" 27 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
27 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h" 28 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h"
28 #include "chrome/browser/chromeos/arc/print/arc_print_service.h" 29 #include "chrome/browser/chromeos/arc/print/arc_print_service.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 base::MakeUnique<ArcPrintService>(arc_bridge_service)); 131 base::MakeUnique<ArcPrintService>(arc_bridge_service));
131 arc_service_manager_->AddService( 132 arc_service_manager_->AddService(
132 base::MakeUnique<ArcProcessService>(arc_bridge_service)); 133 base::MakeUnique<ArcProcessService>(arc_bridge_service));
133 arc_service_manager_->AddService( 134 arc_service_manager_->AddService(
134 base::MakeUnique<ArcSettingsService>(arc_bridge_service)); 135 base::MakeUnique<ArcSettingsService>(arc_bridge_service));
135 arc_service_manager_->AddService( 136 arc_service_manager_->AddService(
136 base::MakeUnique<ArcStorageManager>(arc_bridge_service)); 137 base::MakeUnique<ArcStorageManager>(arc_bridge_service));
137 arc_service_manager_->AddService( 138 arc_service_manager_->AddService(
138 base::MakeUnique<ArcTtsService>(arc_bridge_service)); 139 base::MakeUnique<ArcTtsService>(arc_bridge_service));
139 arc_service_manager_->AddService( 140 arc_service_manager_->AddService(
141 base::MakeUnique<ArcVoiceInteractionService>(arc_bridge_service));
xc 2017/03/09 05:05:47 Can we use the flag to guard the creation of the s
Muyuan 2017/03/09 20:44:44 Not quite sure about this. Going to check with lui
Luis Héctor Chávez 2017/03/14 02:11:32 Yes, that also works.
142 arc_service_manager_->AddService(
140 base::MakeUnique<ArcWallpaperService>(arc_bridge_service)); 143 base::MakeUnique<ArcWallpaperService>(arc_bridge_service));
141 arc_service_manager_->AddService( 144 arc_service_manager_->AddService(
142 base::MakeUnique<GpuArcVideoServiceHost>(arc_bridge_service)); 145 base::MakeUnique<GpuArcVideoServiceHost>(arc_bridge_service));
143 } 146 }
144 147
145 void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) { 148 void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) {
146 DCHECK(arc_service_manager_); 149 DCHECK(arc_service_manager_);
147 DCHECK(arc_session_manager_); 150 DCHECK(arc_session_manager_);
148 // TODO(hidehiko): DCHECK(!arc_session_manager_->IsAllowed()) here. 151 // TODO(hidehiko): DCHECK(!arc_session_manager_->IsAllowed()) here.
149 // Do not expect it in real use case, but it is used for testing. 152 // Do not expect it in real use case, but it is used for testing.
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 void ArcServiceLauncher::Shutdown() { 196 void ArcServiceLauncher::Shutdown() {
194 // Destroy in the reverse order of the initialization. 197 // Destroy in the reverse order of the initialization.
195 arc_play_store_enabled_preference_handler_.reset(); 198 arc_play_store_enabled_preference_handler_.reset();
196 if (arc_service_manager_) 199 if (arc_service_manager_)
197 arc_service_manager_->Shutdown(); 200 arc_service_manager_->Shutdown();
198 arc_session_manager_.reset(); 201 arc_session_manager_.reset();
199 arc_service_manager_.reset(); 202 arc_service_manager_.reset();
200 } 203 }
201 204
202 } // namespace arc 205 } // namespace arc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698