Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: components/arc/arc_service_manager.cc

Issue 2061183002: arc: IPC method to set custom wallpaper. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Style fix. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(
- 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())));

Powered by Google App Engine
This is Rietveld 408576698