| Index: components/arc/arc_service_manager.cc
|
| diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc
|
| index 28669e5571b6d9eb42b5148d25f2af115a87ff2d..7cb77135604c392cdaa6616ef1303bbf4f0c2238 100644
|
| --- a/components/arc/arc_service_manager.cc
|
| +++ b/components/arc/arc_service_manager.cc
|
| @@ -41,7 +41,8 @@ ArcBridgeService* g_arc_bridge_service_for_testing = nullptr;
|
| ArcServiceManager::ArcServiceManager(
|
| scoped_refptr<base::TaskRunner> blocking_task_runner)
|
| : blocking_task_runner_(blocking_task_runner),
|
| - icon_loader_(new ActivityIconLoader) {
|
| + icon_loader_(new ActivityIconLoader),
|
| + activity_resolver_(new LocalActivityResolver) {
|
| DCHECK(!g_arc_service_manager);
|
| g_arc_service_manager = this;
|
|
|
| @@ -118,6 +119,7 @@ void ArcServiceManager::OnAshStarted() {
|
|
|
| void ArcServiceManager::Shutdown() {
|
| icon_loader_ = nullptr;
|
| + activity_resolver_ = nullptr;
|
| services_.clear();
|
| }
|
|
|
|
|