summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-03 18:18:55 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-03 18:18:55 +0000
commit7f22dc466d278b11168302d9176f771c17ca0a9f (patch)
treeec7ba86362a57c7fbb2577f85da7e45f85bed05f /chrome/browser/prefs
parentda6bfb0ba6ed5ac9b2502d55e0161fc1d58a82e8 (diff)
downloadchromium_src-7f22dc466d278b11168302d9176f771c17ca0a9f.zip
chromium_src-7f22dc466d278b11168302d9176f771c17ca0a9f.tar.gz
chromium_src-7f22dc466d278b11168302d9176f771c17ca0a9f.tar.bz2
Added a PolicyCertVerifier that uses the trust anchors from the ONC policies.
The MultiThreadedCertVerifier can optionally use a CertTrustAnchorProvider to get a list of additional certificates to trust, without importing them into the NSS database. This CL wraps the MultiThreadedCertVerifier with a custom verifier that includes a trust anchor provider. The trust anchor provider returns all the certificates from the user ONC policy that have the Web trust flag. The PolicyCertVerifier also writes a preference in the Profile once any such certificate is used. This feature is currently behind a flag, until a warning UI is implemented. The warning should be displayed if UsedPolicyCertificates() is true for the given profile. BUG=216495 Review URL: https://codereview.chromium.org/13035003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index db51151..f4ee9a1 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -302,6 +302,7 @@ void RegisterUserPrefs(PrefRegistrySyncable* registry) {
TranslatePrefs::RegisterUserPrefs(registry);
#if defined(ENABLE_CONFIGURATION_POLICY)
+ policy::BrowserPolicyConnector::RegisterUserPrefs(registry);
policy::URLBlacklistManager::RegisterUserPrefs(registry);
#endif