Add PerAppTimeLimitWhitelist policy
This cl adds kPerAppTimeLimitWhitelist child user policy. The policy
specifies the always allowed URLs and applications that will not
get blocked.
The whitelist policy overrides settings configured by PerAppTimeLimit.
Support for whitelisting URLs, for example, is required because there
are certain crucial access requests to URLs that should not be blocked
even though the PerAppTimeLimit policy's set time limit on chrome has
been reached. Examples of these URLs are chrome://*, file://*
and support.google.com.
Bug: 1022093
Change-Id: Ic625ca5e301bd742925bc88af06395a05b39337c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1929086
Commit-Queue: Yilkal Abe <[email protected]>
Reviewed-by: Pavol Marko <[email protected]>
Reviewed-by: Dominic Battré <[email protected]>
Reviewed-by: Aga Wronska <[email protected]>
Cr-Commit-Position: refs/heads/master@{#729588}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index c3e9874..b2a459fb 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -252,6 +252,7 @@
#include "chrome/browser/chromeos/bluetooth/debug_logs_manager.h"
#include "chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/chromeos/child_accounts/screen_time_controller.h"
+#include "chrome/browser/chromeos/child_accounts/time_limits/app_time_controller.h"
#include "chrome/browser/chromeos/crostini/crostini_pref_names.h"
#include "chrome/browser/chromeos/crostini/crostini_registry_service.h"
#include "chrome/browser/chromeos/cryptauth/cryptauth_device_id_provider_impl.h"
@@ -948,6 +949,7 @@
certificate_manager::CertificatesHandler::RegisterProfilePrefs(registry);
chromeos::AccountManager::RegisterPrefs(registry);
chromeos::ApkWebAppService::RegisterProfilePrefs(registry);
+ chromeos::app_time::AppTimeController::RegisterProfilePrefs(registry);
chromeos::assistant::prefs::RegisterProfilePrefs(registry);
chromeos::bluetooth::DebugLogsManager::RegisterPrefs(registry);
chromeos::CupsPrintersManager::RegisterProfilePrefs(registry);