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

Unified Diff: components/arc/arc_service_manager.cc

Issue 2524673003: arc: Stop/start ARC++ kiosk app when maintenance session started/finished. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pass BrowserContext from ArcServiceManager. Created 4 years, 1 month 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 6d6a25f5fdf87cc191176b86f63f1177cde0239f..b894ab79ecf0ff7c1f6e9d75c174501a90a71288 100644
--- a/components/arc/arc_service_manager.cc
+++ b/components/arc/arc_service_manager.cc
@@ -62,7 +62,6 @@ ArcServiceManager::ArcServiceManager(
AddService(base::MakeUnique<ArcCrashCollectorBridge>(arc_bridge_service(),
blocking_task_runner_));
AddService(base::MakeUnique<ArcImeService>(arc_bridge_service()));
- AddService(base::MakeUnique<ArcKioskBridge>(arc_bridge_service()));
AddService(base::MakeUnique<ArcMetricsService>(arc_bridge_service()));
AddService(base::MakeUnique<ArcNetHostImpl>(arc_bridge_service()));
AddService(base::MakeUnique<ArcObbMounterBridge>(arc_bridge_service()));
@@ -99,10 +98,13 @@ void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) {
void ArcServiceManager::OnPrimaryUserProfilePrepared(
const AccountId& account_id,
+ content::BrowserContext* browser_context,
std::unique_ptr<BooleanPrefMember> arc_enabled_pref) {
DCHECK(thread_checker_.CalledOnValidThread());
AddService(base::MakeUnique<ArcNotificationManager>(arc_bridge_service(),
account_id));
+ AddService(
+ base::MakeUnique<ArcKioskBridge>(arc_bridge_service(), browser_context));
}
void ArcServiceManager::Shutdown() {

Powered by Google App Engine
This is Rietveld 408576698