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

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

Issue 2507073002: Split ArcSessionManager from ArcAuthService. (Closed)
Patch Set: Fix rebase mistake Created 4 years, 1 month 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 "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 9 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
10 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
10 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h" 11 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_se rvice.h"
11 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h" 12 #include "chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_servic e.h"
12 #include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_service.h" 13 #include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_service.h"
13 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h" 14 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h"
14 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h " 15 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h "
15 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" 16 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
16 #include "chrome/browser/chromeos/arc/print/arc_print_service.h" 17 #include "chrome/browser/chromeos/arc/print/arc_print_service.h"
17 #include "chrome/browser/chromeos/arc/process/arc_process_service.h" 18 #include "chrome/browser/chromeos/arc/process/arc_process_service.h"
18 #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h" 19 #include "chrome/browser/chromeos/arc/tts/arc_tts_service.h"
19 #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h" 20 #include "chrome/browser/chromeos/arc/video/gpu_arc_video_service_host.h"
20 #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h" 21 #include "chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.h"
21 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" 22 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
22 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
23 24
24 namespace arc { 25 namespace arc {
25 26
26 ArcServiceLauncher::ArcServiceLauncher() = default; 27 ArcServiceLauncher::ArcServiceLauncher() = default;
27 28
28 ArcServiceLauncher::~ArcServiceLauncher() = default; 29 ArcServiceLauncher::~ArcServiceLauncher() = default;
29 30
30 void ArcServiceLauncher::Initialize() { 31 void ArcServiceLauncher::Initialize() {
31 // Create ARC service manager. 32 // Create ARC service manager.
32 arc_service_manager_ = base::MakeUnique<ArcServiceManager>( 33 arc_service_manager_ = base::MakeUnique<ArcServiceManager>(
33 content::BrowserThread::GetBlockingPool()); 34 content::BrowserThread::GetBlockingPool());
35
36 // Creates ArcSessionManager at first.
37 // TODO(hidehiko): ArcSessionManager should be rather than an ArcService but
38 // its manager. Restructure it to reflect the concept.
39 arc_service_manager_->AddService(base::MakeUnique<ArcSessionManager>(
40 arc_service_manager_->arc_bridge_service()));
41
34 arc_service_manager_->AddService(base::MakeUnique<ArcAuthService>( 42 arc_service_manager_->AddService(base::MakeUnique<ArcAuthService>(
35 arc_service_manager_->arc_bridge_service())); 43 arc_service_manager_->arc_bridge_service()));
36 arc_service_manager_->AddService(base::MakeUnique<ArcBootErrorNotification>( 44 arc_service_manager_->AddService(base::MakeUnique<ArcBootErrorNotification>(
37 arc_service_manager_->arc_bridge_service())); 45 arc_service_manager_->arc_bridge_service()));
38 arc_service_manager_->AddService( 46 arc_service_manager_->AddService(
39 base::MakeUnique<ArcContentFileSystemService>( 47 base::MakeUnique<ArcContentFileSystemService>(
40 arc_service_manager_->arc_bridge_service())); 48 arc_service_manager_->arc_bridge_service()));
41 arc_service_manager_->AddService(base::MakeUnique<ArcDownloadsWatcherService>( 49 arc_service_manager_->AddService(base::MakeUnique<ArcDownloadsWatcherService>(
42 arc_service_manager_->arc_bridge_service())); 50 arc_service_manager_->arc_bridge_service()));
43 arc_service_manager_->AddService( 51 arc_service_manager_->AddService(
(...skipping 18 matching lines...) Expand all
62 arc_service_manager_->AddService(base::MakeUnique<GpuArcVideoServiceHost>( 70 arc_service_manager_->AddService(base::MakeUnique<GpuArcVideoServiceHost>(
63 arc_service_manager_->arc_bridge_service())); 71 arc_service_manager_->arc_bridge_service()));
64 } 72 }
65 73
66 void ArcServiceLauncher::Shutdown() { 74 void ArcServiceLauncher::Shutdown() {
67 DCHECK(arc_service_manager_); 75 DCHECK(arc_service_manager_);
68 arc_service_manager_->Shutdown(); 76 arc_service_manager_->Shutdown();
69 } 77 }
70 78
71 } // namespace arc 79 } // namespace arc
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_optin_uma.h ('k') | chrome/browser/chromeos/arc/arc_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698