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 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 base::MakeUnique<ArcContentFileSystemService>(arc_bridge_service)); | 94 base::MakeUnique<ArcContentFileSystemService>(arc_bridge_service)); |
95 arc_service_manager_->AddService(base::MakeUnique<ArcCrashCollectorBridge>( | 95 arc_service_manager_->AddService(base::MakeUnique<ArcCrashCollectorBridge>( |
96 arc_bridge_service, arc_service_manager_->blocking_task_runner())); | 96 arc_bridge_service, arc_service_manager_->blocking_task_runner())); |
97 arc_service_manager_->AddService( | 97 arc_service_manager_->AddService( |
98 base::MakeUnique<ArcDownloadsWatcherService>(arc_bridge_service)); | 98 base::MakeUnique<ArcDownloadsWatcherService>(arc_bridge_service)); |
99 arc_service_manager_->AddService( | 99 arc_service_manager_->AddService( |
100 base::MakeUnique<ArcEnterpriseReportingService>(arc_bridge_service)); | 100 base::MakeUnique<ArcEnterpriseReportingService>(arc_bridge_service)); |
101 auto intent_helper = base::MakeUnique<ArcIntentHelperBridge>( | 101 auto intent_helper = base::MakeUnique<ArcIntentHelperBridge>( |
102 arc_bridge_service, arc_service_manager_->icon_loader(), | 102 arc_bridge_service, arc_service_manager_->icon_loader(), |
103 arc_service_manager_->activity_resolver()); | 103 arc_service_manager_->activity_resolver()); |
104 // We don't have to remove observer since | 104 // We don't have to call ArcIntentHelperBridge::RemoveObserver() in |
105 // ArcServiceManager always outlives ArcIntentHelperBridge. | 105 // ~ArcServiceManager() since the observer in ArcServiceManager always |
106 intent_helper->AddObserver(arc_service_manager_.get()); | 106 // outlives the ArcIntentHelperBridge object. |
| 107 intent_helper->AddObserver(arc_service_manager_->intent_helper_observer()); |
107 arc_service_manager_->AddService(std::move(intent_helper)); | 108 arc_service_manager_->AddService(std::move(intent_helper)); |
108 arc_service_manager_->AddService( | 109 arc_service_manager_->AddService( |
109 base::MakeUnique<ArcImeService>(arc_bridge_service)); | 110 base::MakeUnique<ArcImeService>(arc_bridge_service)); |
110 arc_service_manager_->AddService( | 111 arc_service_manager_->AddService( |
111 base::MakeUnique<ArcKioskBridge>(arc_bridge_service)); | 112 base::MakeUnique<ArcKioskBridge>(arc_bridge_service)); |
112 arc_service_manager_->AddService( | 113 arc_service_manager_->AddService( |
113 base::MakeUnique<ArcMetricsService>(arc_bridge_service)); | 114 base::MakeUnique<ArcMetricsService>(arc_bridge_service)); |
114 arc_service_manager_->AddService( | 115 arc_service_manager_->AddService( |
115 base::MakeUnique<ArcNetHostImpl>(arc_bridge_service)); | 116 base::MakeUnique<ArcNetHostImpl>(arc_bridge_service)); |
116 arc_service_manager_->AddService( | 117 arc_service_manager_->AddService( |
(...skipping 28 matching lines...) Expand all Loading... |
145 | 146 |
146 void ArcServiceLauncher::Shutdown() { | 147 void ArcServiceLauncher::Shutdown() { |
147 DCHECK(arc_service_manager_); | 148 DCHECK(arc_service_manager_); |
148 // Destroy in the reverse order of the initialization. | 149 // Destroy in the reverse order of the initialization. |
149 arc_service_manager_->Shutdown(); | 150 arc_service_manager_->Shutdown(); |
150 arc_session_manager_.reset(); | 151 arc_session_manager_.reset(); |
151 arc_service_manager_.reset(); | 152 arc_service_manager_.reset(); |
152 } | 153 } |
153 | 154 |
154 } // namespace arc | 155 } // namespace arc |
OLD | NEW |