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

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

Issue 2559663002: Support focus highlight in Android window (Closed)
Patch Set: Address comments. Created 3 years, 11 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 "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.h" 12 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.h"
13 #include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bri dge.h"
13 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 14 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
14 #include "chrome/browser/chromeos/arc/arc_session_manager.h" 15 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
15 #include "chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_ bridge.h" 16 #include "chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_ bridge.h"
16 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h" 17 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h"
17 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h" 18 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h"
18 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_service.h" 19 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_service.h"
19 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h" 20 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h"
20 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h " 21 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h "
21 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" 22 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
22 #include "chrome/browser/chromeos/arc/print/arc_print_service.h" 23 #include "chrome/browser/chromeos/arc/print/arc_print_service.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 arc_service_manager_->arc_bridge_service(); 81 arc_service_manager_->arc_bridge_service();
81 82
82 // Creates ArcSessionManager at first. 83 // Creates ArcSessionManager at first.
83 arc_session_manager_ = 84 arc_session_manager_ =
84 base::MakeUnique<ArcSessionManager>(base::MakeUnique<ArcSessionRunner>( 85 base::MakeUnique<ArcSessionManager>(base::MakeUnique<ArcSessionRunner>(
85 base::Bind(ArcSession::Create, arc_bridge_service, 86 base::Bind(ArcSession::Create, arc_bridge_service,
86 arc_service_manager_->blocking_task_runner()))); 87 arc_service_manager_->blocking_task_runner())));
87 88
88 // List in lexicographical order. 89 // List in lexicographical order.
89 arc_service_manager_->AddService( 90 arc_service_manager_->AddService(
91 base::MakeUnique<ArcAccessibilityHelperBridge>(arc_bridge_service));
92 arc_service_manager_->AddService(
90 base::MakeUnique<ArcAudioBridge>(arc_bridge_service)); 93 base::MakeUnique<ArcAudioBridge>(arc_bridge_service));
91 arc_service_manager_->AddService( 94 arc_service_manager_->AddService(
92 base::MakeUnique<ArcAuthService>(arc_bridge_service)); 95 base::MakeUnique<ArcAuthService>(arc_bridge_service));
93 arc_service_manager_->AddService( 96 arc_service_manager_->AddService(
94 base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service)); 97 base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service));
95 arc_service_manager_->AddService( 98 arc_service_manager_->AddService(
96 base::MakeUnique<ArcBootErrorNotification>(arc_bridge_service)); 99 base::MakeUnique<ArcBootErrorNotification>(arc_bridge_service));
97 arc_service_manager_->AddService( 100 arc_service_manager_->AddService(
98 base::MakeUnique<ArcBootPhaseMonitorBridge>(arc_bridge_service)); 101 base::MakeUnique<ArcBootPhaseMonitorBridge>(arc_bridge_service));
99 arc_service_manager_->AddService( 102 arc_service_manager_->AddService(
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 160
158 void ArcServiceLauncher::Shutdown() { 161 void ArcServiceLauncher::Shutdown() {
159 DCHECK(arc_service_manager_); 162 DCHECK(arc_service_manager_);
160 // Destroy in the reverse order of the initialization. 163 // Destroy in the reverse order of the initialization.
161 arc_service_manager_->Shutdown(); 164 arc_service_manager_->Shutdown();
162 arc_session_manager_.reset(); 165 arc_session_manager_.reset();
163 arc_service_manager_.reset(); 166 arc_service_manager_.reset();
164 } 167 }
165 168
166 } // namespace arc 169 } // namespace arc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698