| 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 4499c8a4489e4f946330d42619c84b7e1d94be35..b2cee596a287239c13e15ae4ba6f00ae30d96532 100644
|
| --- a/chrome/browser/chromeos/arc/arc_service_launcher.cc
|
| +++ b/chrome/browser/chromeos/arc/arc_service_launcher.cc
|
| @@ -11,10 +11,12 @@
|
| #include "chrome/browser/chromeos/arc/arc_policy_bridge.h"
|
| #include "chrome/browser/chromeos/arc/arc_process_service.h"
|
| #include "chrome/browser/chromeos/arc/arc_settings_service.h"
|
| +#include "chrome/browser/chromeos/arc/arc_wallpaper_handler.h"
|
| #include "chrome/browser/chromeos/arc/gpu_arc_video_service_host.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "chromeos/dbus/session_manager_client.h"
|
| #include "components/arc/arc_bridge_service.h"
|
| +#include "components/arc/intent_helper/arc_intent_helper_bridge.h"
|
| #include "content/public/browser/browser_thread.h"
|
|
|
| namespace arc {
|
| @@ -25,21 +27,24 @@ ArcServiceLauncher::~ArcServiceLauncher() {}
|
|
|
| void ArcServiceLauncher::Initialize() {
|
| // Create ARC service manager.
|
| - arc_service_manager_.reset(
|
| - new ArcServiceManager(content::BrowserThread::GetBlockingPool()));
|
| - arc_service_manager_->AddService(base::WrapUnique(
|
| - new ArcAuthService(arc_service_manager_->arc_bridge_service())));
|
| - arc_service_manager_->AddService(
|
| - base::WrapUnique(new ArcDownloadsWatcherService(
|
| - arc_service_manager_->arc_bridge_service())));
|
| - arc_service_manager_->AddService(base::WrapUnique(
|
| - new ArcPolicyBridge(arc_service_manager_->arc_bridge_service())));
|
| - arc_service_manager_->AddService(base::WrapUnique(
|
| - new ArcProcessService(arc_service_manager_->arc_bridge_service())));
|
| - arc_service_manager_->AddService(base::WrapUnique(
|
| - new ArcSettingsService(arc_service_manager_->arc_bridge_service())));
|
| - arc_service_manager_->AddService(base::WrapUnique(
|
| - new GpuArcVideoServiceHost(arc_service_manager_->arc_bridge_service())));
|
| + arc_service_manager_ = base::MakeUnique<ArcServiceManager>(
|
| + content::BrowserThread::GetBlockingPool());
|
| + arc_service_manager_->AddService(base::MakeUnique<ArcIntentHelperBridge>(
|
| + arc_service_manager_->arc_bridge_service(),
|
| + arc_service_manager_->icon_loader(),
|
| + base::MakeUnique<ArcWallpaperHandler>()));
|
| + arc_service_manager_->AddService(base::MakeUnique<ArcAuthService>(
|
| + arc_service_manager_->arc_bridge_service()));
|
| + arc_service_manager_->AddService(base::MakeUnique<ArcDownloadsWatcherService>(
|
| + arc_service_manager_->arc_bridge_service()));
|
| + arc_service_manager_->AddService(base::MakeUnique<ArcPolicyBridge>(
|
| + arc_service_manager_->arc_bridge_service()));
|
| + arc_service_manager_->AddService(base::MakeUnique<ArcProcessService>(
|
| + arc_service_manager_->arc_bridge_service()));
|
| + arc_service_manager_->AddService(base::MakeUnique<ArcSettingsService>(
|
| + arc_service_manager_->arc_bridge_service()));
|
| + arc_service_manager_->AddService(base::MakeUnique<GpuArcVideoServiceHost>(
|
| + arc_service_manager_->arc_bridge_service()));
|
|
|
| // Detect availability.
|
| chromeos::SessionManagerClient* session_manager_client =
|
|
|