Chromium Code Reviews| 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/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 91 arc_service_manager_->AddService( | 91 arc_service_manager_->AddService( |
| 92 base::MakeUnique<ArcAuthService>(arc_bridge_service)); | 92 base::MakeUnique<ArcAuthService>(arc_bridge_service)); |
| 93 arc_service_manager_->AddService( | 93 arc_service_manager_->AddService( |
| 94 base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service)); | 94 base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service)); |
| 95 arc_service_manager_->AddService( | 95 arc_service_manager_->AddService( |
| 96 base::MakeUnique<ArcBootErrorNotification>(arc_bridge_service)); | 96 base::MakeUnique<ArcBootErrorNotification>(arc_bridge_service)); |
| 97 arc_service_manager_->AddService( | 97 arc_service_manager_->AddService( |
| 98 base::MakeUnique<ArcBootPhaseMonitorBridge>(arc_bridge_service)); | 98 base::MakeUnique<ArcBootPhaseMonitorBridge>(arc_bridge_service)); |
| 99 arc_service_manager_->AddService( | 99 arc_service_manager_->AddService( |
| 100 base::MakeUnique<ArcClipboardBridge>(arc_bridge_service)); | 100 base::MakeUnique<ArcClipboardBridge>(arc_bridge_service)); |
| 101 arc_service_manager_->AddService( | 101 auto file_system_service = |
| 102 base::MakeUnique<ArcFileSystemService>(arc_bridge_service)); | 102 base::MakeUnique<ArcFileSystemService>(arc_bridge_service); |
| 103 // We don't have to call ArcFileSystemService::RemoveObserver() in | |
| 104 // ~ArcServiceManager() since the observer in ArcServiceManager always | |
| 105 // outlives the ArcFileSystemService object. | |
| 106 file_system_service->AddObserver( | |
|
Luis Héctor Chávez
2017/01/10 05:49:04
This looks kind of weird. Can we either:
a) Prefe
| |
| 107 arc_service_manager_->file_system_observer()); | |
| 108 arc_service_manager_->AddService(std::move(file_system_service)); | |
| 103 arc_service_manager_->AddService(base::MakeUnique<ArcCrashCollectorBridge>( | 109 arc_service_manager_->AddService(base::MakeUnique<ArcCrashCollectorBridge>( |
| 104 arc_bridge_service, arc_service_manager_->blocking_task_runner())); | 110 arc_bridge_service, arc_service_manager_->blocking_task_runner())); |
| 105 arc_service_manager_->AddService( | 111 arc_service_manager_->AddService( |
| 106 base::MakeUnique<ArcDownloadsWatcherService>(arc_bridge_service)); | 112 base::MakeUnique<ArcDownloadsWatcherService>(arc_bridge_service)); |
| 107 arc_service_manager_->AddService( | 113 arc_service_manager_->AddService( |
| 108 base::MakeUnique<ArcEnterpriseReportingService>(arc_bridge_service)); | 114 base::MakeUnique<ArcEnterpriseReportingService>(arc_bridge_service)); |
| 109 auto intent_helper = base::MakeUnique<ArcIntentHelperBridge>( | 115 auto intent_helper = base::MakeUnique<ArcIntentHelperBridge>( |
| 110 arc_bridge_service, arc_service_manager_->icon_loader(), | 116 arc_bridge_service, arc_service_manager_->icon_loader(), |
| 111 arc_service_manager_->activity_resolver()); | 117 arc_service_manager_->activity_resolver()); |
| 112 // We don't have to call ArcIntentHelperBridge::RemoveObserver() in | 118 // We don't have to call ArcIntentHelperBridge::RemoveObserver() in |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 | 168 |
| 163 void ArcServiceLauncher::Shutdown() { | 169 void ArcServiceLauncher::Shutdown() { |
| 164 DCHECK(arc_service_manager_); | 170 DCHECK(arc_service_manager_); |
| 165 // Destroy in the reverse order of the initialization. | 171 // Destroy in the reverse order of the initialization. |
| 166 arc_service_manager_->Shutdown(); | 172 arc_service_manager_->Shutdown(); |
| 167 arc_session_manager_.reset(); | 173 arc_session_manager_.reset(); |
| 168 arc_service_manager_.reset(); | 174 arc_service_manager_.reset(); |
| 169 } | 175 } |
| 170 | 176 |
| 171 } // namespace arc | 177 } // namespace arc |
| OLD | NEW |