OLD | NEW |
---|---|
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 |
hidehiko
2016/11/25 15:38:00
#include <utility> for std::move?
oka
2016/11/28 07:15:43
Done.
| |
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/arc_session_manager.h" |
11 #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" |
12 #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" |
13 #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" |
14 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h" | 14 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h" |
15 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h " | 15 #include "chrome/browser/chromeos/arc/notification/arc_boot_error_notification.h " |
16 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" | 16 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h" |
(...skipping 27 matching lines...) Expand all Loading... | |
44 arc_service_manager_->AddService(base::MakeUnique<ArcBootErrorNotification>( | 44 arc_service_manager_->AddService(base::MakeUnique<ArcBootErrorNotification>( |
45 arc_service_manager_->arc_bridge_service())); | 45 arc_service_manager_->arc_bridge_service())); |
46 arc_service_manager_->AddService( | 46 arc_service_manager_->AddService( |
47 base::MakeUnique<ArcContentFileSystemService>( | 47 base::MakeUnique<ArcContentFileSystemService>( |
48 arc_service_manager_->arc_bridge_service())); | 48 arc_service_manager_->arc_bridge_service())); |
49 arc_service_manager_->AddService(base::MakeUnique<ArcDownloadsWatcherService>( | 49 arc_service_manager_->AddService(base::MakeUnique<ArcDownloadsWatcherService>( |
50 arc_service_manager_->arc_bridge_service())); | 50 arc_service_manager_->arc_bridge_service())); |
51 arc_service_manager_->AddService( | 51 arc_service_manager_->AddService( |
52 base::MakeUnique<ArcEnterpriseReportingService>( | 52 base::MakeUnique<ArcEnterpriseReportingService>( |
53 arc_service_manager_->arc_bridge_service())); | 53 arc_service_manager_->arc_bridge_service())); |
54 arc_service_manager_->AddService(base::MakeUnique<ArcIntentHelperBridge>( | 54 auto intent_helper = base::MakeUnique<ArcIntentHelperBridge>( |
55 arc_service_manager_->arc_bridge_service(), | 55 arc_service_manager_->arc_bridge_service(), |
56 arc_service_manager_->icon_loader(), | 56 arc_service_manager_->icon_loader(), |
57 arc_service_manager_->activity_resolver())); | 57 arc_service_manager_->activity_resolver()); |
58 // We don't have to remove observer since | |
59 // ArcServiceManager always outlives ArcIntentHelperBridge. | |
60 intent_helper->AddObserver(arc_service_manager_.get()); | |
61 arc_service_manager_->AddService(std::move(intent_helper)); | |
58 arc_service_manager_->AddService(base::MakeUnique<ArcPolicyBridge>( | 62 arc_service_manager_->AddService(base::MakeUnique<ArcPolicyBridge>( |
59 arc_service_manager_->arc_bridge_service())); | 63 arc_service_manager_->arc_bridge_service())); |
60 arc_service_manager_->AddService(base::MakeUnique<ArcPrintService>( | 64 arc_service_manager_->AddService(base::MakeUnique<ArcPrintService>( |
61 arc_service_manager_->arc_bridge_service())); | 65 arc_service_manager_->arc_bridge_service())); |
62 arc_service_manager_->AddService(base::MakeUnique<ArcProcessService>( | 66 arc_service_manager_->AddService(base::MakeUnique<ArcProcessService>( |
63 arc_service_manager_->arc_bridge_service())); | 67 arc_service_manager_->arc_bridge_service())); |
64 arc_service_manager_->AddService(base::MakeUnique<ArcSettingsService>( | 68 arc_service_manager_->AddService(base::MakeUnique<ArcSettingsService>( |
65 arc_service_manager_->arc_bridge_service())); | 69 arc_service_manager_->arc_bridge_service())); |
66 arc_service_manager_->AddService(base::MakeUnique<ArcTtsService>( | 70 arc_service_manager_->AddService(base::MakeUnique<ArcTtsService>( |
67 arc_service_manager_->arc_bridge_service())); | 71 arc_service_manager_->arc_bridge_service())); |
68 arc_service_manager_->AddService(base::MakeUnique<ArcWallpaperService>( | 72 arc_service_manager_->AddService(base::MakeUnique<ArcWallpaperService>( |
69 arc_service_manager_->arc_bridge_service())); | 73 arc_service_manager_->arc_bridge_service())); |
70 arc_service_manager_->AddService(base::MakeUnique<GpuArcVideoServiceHost>( | 74 arc_service_manager_->AddService(base::MakeUnique<GpuArcVideoServiceHost>( |
71 arc_service_manager_->arc_bridge_service())); | 75 arc_service_manager_->arc_bridge_service())); |
72 } | 76 } |
73 | 77 |
74 void ArcServiceLauncher::Shutdown() { | 78 void ArcServiceLauncher::Shutdown() { |
75 DCHECK(arc_service_manager_); | 79 DCHECK(arc_service_manager_); |
76 arc_service_manager_->Shutdown(); | 80 arc_service_manager_->Shutdown(); |
77 } | 81 } |
78 | 82 |
79 } // namespace arc | 83 } // namespace arc |
OLD | NEW |