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 4499c8a4489e4f946330d42619c84b7e1d94be35..de4d9c8f9bf199a1fe05ec5f585cf37641e82b77 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 { |
| @@ -28,6 +30,11 @@ void ArcServiceLauncher::Initialize() { |
| arc_service_manager_.reset( |
| new ArcServiceManager(content::BrowserThread::GetBlockingPool())); |
| arc_service_manager_->AddService(base::WrapUnique( |
| + new ArcIntentHelperBridge(arc_service_manager_->arc_bridge_service(), |
| + arc_service_manager_->icon_loader(), |
| + content::BrowserThread::GetBlockingPool(), |
|
hidehiko
2016/06/14 13:44:16
Why not sharing the pool with arc_service_manager?
Shuhei Takahashi
2016/06/14 14:08:39
It is a shared pool so every call to GetBlockingPo
|
| + base::WrapUnique(new ArcWallpaperHandler())))); |
| + arc_service_manager_->AddService(base::WrapUnique( |
| new ArcAuthService(arc_service_manager_->arc_bridge_service()))); |
| arc_service_manager_->AddService( |
| base::WrapUnique(new ArcDownloadsWatcherService( |