| Index: components/arc/arc_service_manager.h
|
| diff --git a/components/arc/arc_service_manager.h b/components/arc/arc_service_manager.h
|
| index 31d2b23b59245caf3190012f82e3d84f29fff9af..7d540a0c781dd4e4456285beac8a1b4b8624e8b7 100644
|
| --- a/components/arc/arc_service_manager.h
|
| +++ b/components/arc/arc_service_manager.h
|
| @@ -16,13 +16,12 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/task_runner.h"
|
| #include "base/threading/thread_checker.h"
|
| -#include "components/arc/intent_helper/activity_icon_loader.h"
|
| +#include "components/arc/arc_service.h"
|
| #include "components/arc/intent_helper/local_activity_resolver.h"
|
|
|
| namespace arc {
|
|
|
| class ArcBridgeService;
|
| -class ArcService;
|
|
|
| namespace internal {
|
|
|
| @@ -107,9 +106,6 @@ class ArcServiceManager {
|
| return blocking_task_runner_;
|
| }
|
|
|
| - // Returns the icon loader owned by ArcServiceManager and shared by services.
|
| - scoped_refptr<ActivityIconLoader> icon_loader() { return icon_loader_; }
|
| -
|
| // Returns the activity resolver owned by ArcServiceManager.
|
| scoped_refptr<LocalActivityResolver> activity_resolver() {
|
| return activity_resolver_;
|
| @@ -128,7 +124,6 @@ class ArcServiceManager {
|
|
|
| std::unique_ptr<ArcBridgeService> arc_bridge_service_;
|
| std::unordered_multimap<std::string, std::unique_ptr<ArcService>> services_;
|
| - scoped_refptr<ActivityIconLoader> icon_loader_;
|
| scoped_refptr<LocalActivityResolver> activity_resolver_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ArcServiceManager);
|
|
|