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

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

Issue 2596273002: Move ArcSessionRunner from ArcBridgeService to ArcSessionManager. (Closed)
Patch Set: Rebase and update 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_session_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/logging.h" 10 #include "base/logging.h"
10 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
11 #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"
12 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 13 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
13 #include "chrome/browser/chromeos/arc/arc_session_manager.h" 14 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
14 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h" 15 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h"
15 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h" 16 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h"
16 #include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_service.h" 17 #include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_service.h"
17 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h" 18 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h"
18 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h " 19 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h "
19 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" 20 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
20 #include "chrome/browser/chromeos/arc/print/arc_print_service.h" 21 #include "chrome/browser/chromeos/arc/print/arc_print_service.h"
21 #include "chrome/browser/chromeos/arc/process/arc_process_service.h" 22 #include "chrome/browser/chromeos/arc/process/arc_process_service.h"
22 #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h" 23 #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h"
23 #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h" 24 #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h"
24 #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h" 25 #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h"
25 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 27 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
27 #include "components/arc/arc_service_manager.h" 28 #include "components/arc/arc_service_manager.h"
29 #include "components/arc/arc_session.h"
30 #include "components/arc/arc_session_runner.h"
28 #include "components/arc/audio/arc_audio_bridge.h" 31 #include "components/arc/audio/arc_audio_bridge.h"
29 #include "components/arc/bluetooth/arc_bluetooth_bridge.h" 32 #include "components/arc/bluetooth/arc_bluetooth_bridge.h"
30 #include "components/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h" 33 #include "components/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h"
31 #include "components/arc/clipboard/arc_clipboard_bridge.h" 34 #include "components/arc/clipboard/arc_clipboard_bridge.h"
32 #include "components/arc/crash_collector/arc_crash_collector_bridge.h" 35 #include "components/arc/crash_collector/arc_crash_collector_bridge.h"
33 #include "components/arc/ime/arc_ime_service.h" 36 #include "components/arc/ime/arc_ime_service.h"
34 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" 37 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
35 #include "components/arc/kiosk/arc_kiosk_bridge.h" 38 #include "components/arc/kiosk/arc_kiosk_bridge.h"
36 #include "components/arc/metrics/arc_metrics_service.h" 39 #include "components/arc/metrics/arc_metrics_service.h"
37 #include "components/arc/net/arc_net_host_impl.h" 40 #include "components/arc/net/arc_net_host_impl.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 void ArcServiceLauncher::Initialize() { 74 void ArcServiceLauncher::Initialize() {
72 // Create ARC service manager. 75 // Create ARC service manager.
73 arc_service_manager_ = base::MakeUnique<ArcServiceManager>( 76 arc_service_manager_ = base::MakeUnique<ArcServiceManager>(
74 content::BrowserThread::GetBlockingPool()); 77 content::BrowserThread::GetBlockingPool());
75 78
76 ArcBridgeService* arc_bridge_service = 79 ArcBridgeService* arc_bridge_service =
77 arc_service_manager_->arc_bridge_service(); 80 arc_service_manager_->arc_bridge_service();
78 81
79 // Creates ArcSessionManager at first. 82 // Creates ArcSessionManager at first.
80 arc_session_manager_ = 83 arc_session_manager_ =
81 base::MakeUnique<ArcSessionManager>(arc_bridge_service); 84 base::MakeUnique<ArcSessionManager>(base::MakeUnique<ArcSessionRunner>(
85 base::Bind(ArcSession::Create, arc_bridge_service,
86 arc_service_manager_->blocking_task_runner())));
82 87
83 // List in lexicographical order. 88 // List in lexicographical order.
84 arc_service_manager_->AddService( 89 arc_service_manager_->AddService(
85 base::MakeUnique<ArcAudioBridge>(arc_bridge_service)); 90 base::MakeUnique<ArcAudioBridge>(arc_bridge_service));
86 arc_service_manager_->AddService( 91 arc_service_manager_->AddService(
87 base::MakeUnique<ArcAuthService>(arc_bridge_service)); 92 base::MakeUnique<ArcAuthService>(arc_bridge_service));
88 arc_service_manager_->AddService( 93 arc_service_manager_->AddService(
89 base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service)); 94 base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service));
90 arc_service_manager_->AddService( 95 arc_service_manager_->AddService(
91 base::MakeUnique<ArcBootErrorNotification>(arc_bridge_service)); 96 base::MakeUnique<ArcBootErrorNotification>(arc_bridge_service));
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 162
158 void ArcServiceLauncher::Shutdown() { 163 void ArcServiceLauncher::Shutdown() {
159 DCHECK(arc_service_manager_); 164 DCHECK(arc_service_manager_);
160 // Destroy in the reverse order of the initialization. 165 // Destroy in the reverse order of the initialization.
161 arc_service_manager_->Shutdown(); 166 arc_service_manager_->Shutdown();
162 arc_session_manager_.reset(); 167 arc_session_manager_.reset();
163 arc_service_manager_.reset(); 168 arc_service_manager_.reset();
164 } 169 }
165 170
166 } // namespace arc 171 } // namespace arc
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698