Chromium Code Reviews| Index: chrome/browser/chromeos/arc/arc_service_launcher.cc |
| diff --git a/chrome/browser/chromeos/arc/arc_service_launcher.cc b/chrome/browser/chromeos/arc/arc_service_launcher.cc |
| index 384d7f42f14c1e642cf8be813b1b96f78a0602c4..4178518b907bd94e38dc094935704ab5e1ef94c8 100644 |
| --- a/chrome/browser/chromeos/arc/arc_service_launcher.cc |
| +++ b/chrome/browser/chromeos/arc/arc_service_launcher.cc |
| @@ -15,7 +15,7 @@ |
| #include "chrome/browser/chromeos/arc/arc_process_service.h" |
| #include "chrome/browser/chromeos/arc/arc_settings_service.h" |
| #include "chrome/browser/chromeos/arc/arc_tts_service.h" |
| -#include "chrome/browser/chromeos/arc/arc_wallpaper_handler.h" |
| +#include "chrome/browser/chromeos/arc/arc_wallpaper_service.h" |
| #include "chrome/browser/chromeos/arc/gpu_arc_video_service_host.h" |
| #include "components/arc/arc_bridge_service.h" |
| #include "components/arc/intent_helper/arc_intent_helper_bridge.h" |
| @@ -43,7 +43,6 @@ void ArcServiceLauncher::Initialize() { |
| arc_service_manager_->AddService(base::MakeUnique<ArcIntentHelperBridge>( |
| arc_service_manager_->arc_bridge_service(), |
| arc_service_manager_->icon_loader(), |
| - base::MakeUnique<ArcWallpaperHandler>(), |
| arc_service_manager_->activity_resolver())); |
| arc_service_manager_->AddService(base::MakeUnique<ArcPolicyBridge>( |
| arc_service_manager_->arc_bridge_service())); |
| @@ -57,6 +56,8 @@ void ArcServiceLauncher::Initialize() { |
| arc_service_manager_->arc_bridge_service())); |
| arc_service_manager_->AddService(base::MakeUnique<GpuArcVideoServiceHost>( |
| arc_service_manager_->arc_bridge_service())); |
| + arc_service_manager_->AddService(base::MakeUnique<ArcWallpaperService>( |
|
Luis Héctor Chávez
2016/09/06 20:05:46
nit: keep this list sorted lexicographically.
Muyuan
2016/09/06 23:37:59
Done.
|
| + arc_service_manager_->arc_bridge_service())); |
| } |
| void ArcServiceLauncher::Shutdown() { |