Chromium Code Reviews| Index: components/arc/arc_service_manager.cc |
| diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc |
| index be6d1ee29771c5a9174b92dd2415646d00dfc08f..28669e5571b6d9eb42b5148d25f2af115a87ff2d 100644 |
| --- a/components/arc/arc_service_manager.cc |
| +++ b/components/arc/arc_service_manager.cc |
| @@ -16,7 +16,6 @@ |
| #include "components/arc/crash_collector/arc_crash_collector_bridge.h" |
| #include "components/arc/ime/arc_ime_service.h" |
| #include "components/arc/intent_helper/activity_icon_loader.h" |
| -#include "components/arc/intent_helper/arc_intent_helper_bridge.h" |
| #include "components/arc/metrics/arc_metrics_service.h" |
| #include "components/arc/net/arc_net_host_impl.h" |
| #include "components/arc/obb_mounter/arc_obb_mounter_bridge.h" |
| @@ -41,7 +40,8 @@ ArcBridgeService* g_arc_bridge_service_for_testing = nullptr; |
| ArcServiceManager::ArcServiceManager( |
| scoped_refptr<base::TaskRunner> blocking_task_runner) |
| - : blocking_task_runner_(blocking_task_runner) { |
| + : blocking_task_runner_(blocking_task_runner), |
| + icon_loader_(new ActivityIconLoader) { |
| DCHECK(!g_arc_service_manager); |
| g_arc_service_manager = this; |
| @@ -59,9 +59,6 @@ ArcServiceManager::ArcServiceManager( |
| AddService( |
| base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service()))); |
| AddService(base::WrapUnique(new ArcImeService(arc_bridge_service()))); |
| - icon_loader_ = new ActivityIconLoader; |
| - AddService(base::WrapUnique( |
|
rickyz (no longer on Chrome)
2016/06/16 01:38:48
Was it intentional to remove the adding of this se
hidehiko
2016/06/16 05:49:24
FYI; Moved to arc service launcher, because it sta
Shuhei Takahashi
2016/06/16 14:56:11
Yup, hidehiko is right.
|
| - new ArcIntentHelperBridge(arc_bridge_service(), icon_loader_))); |
| AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service()))); |
| AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service()))); |
| AddService(base::WrapUnique(new ArcObbMounterBridge(arc_bridge_service()))); |