| 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 be75eba071bbd0699ed6eb3f7dafd153bf91976e..ccce0f68ebe2518ac6101ac3deb9455d1f864375 100644
|
| --- a/chrome/browser/chromeos/arc/arc_service_launcher.cc
|
| +++ b/chrome/browser/chromeos/arc/arc_service_launcher.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/memory/ptr_util.h"
|
| +#include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.h"
|
| #include "chrome/browser/chromeos/arc/arc_auth_service.h"
|
| #include "chrome/browser/chromeos/arc/arc_session_manager.h"
|
| #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_service.h"
|
| @@ -37,6 +38,7 @@
|
| #include "components/arc/power/arc_power_bridge.h"
|
| #include "components/arc/storage_manager/arc_storage_manager.h"
|
| #include "components/prefs/pref_member.h"
|
| +#include "components/user_manager/user_manager.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "ui/arc/notification/arc_notification_manager.h"
|
|
|
| @@ -108,8 +110,6 @@ void ArcServiceLauncher::Initialize() {
|
| arc_service_manager_->AddService(
|
| base::MakeUnique<ArcImeService>(arc_bridge_service));
|
| arc_service_manager_->AddService(
|
| - base::MakeUnique<ArcKioskBridge>(arc_bridge_service));
|
| - arc_service_manager_->AddService(
|
| base::MakeUnique<ArcMetricsService>(arc_bridge_service));
|
| arc_service_manager_->AddService(
|
| base::MakeUnique<ArcNetHostImpl>(arc_bridge_service));
|
| @@ -140,6 +140,14 @@ void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) {
|
| arc_service_manager_->AddService(base::MakeUnique<ArcNotificationManager>(
|
| arc_service_manager_->arc_bridge_service(),
|
| multi_user_util::GetAccountIdFromProfile(profile)));
|
| +
|
| + // Kiosk apps should be run only for kiosk sessions.
|
| + if (user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp()) {
|
| + arc_service_manager_->AddService(base::MakeUnique<ArcKioskBridge>(
|
| + arc_service_manager_->arc_bridge_service(),
|
| + chromeos::ArcKioskAppService::Get(profile)));
|
| + }
|
| +
|
| arc_session_manager_->OnPrimaryUserProfilePrepared(profile);
|
| }
|
|
|
|
|