summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorLutz Justen <ljusten@chromium.org>2018-05-24 23:33:00 +0900
committerQijiang Fan <fqj@google.com>2020-06-05 09:28:26 +0900
commit071a4211c9ea2bf681086b54a9f8b3050ef1a42d (patch)
treed5ec2f0d701054edf3139a9576acea4af536135b /components
parentaece0b3a3901af29a2241a19a88a66e30306bb70 (diff)
downloadlibchrome-071a4211c9ea2bf681086b54a9f8b3050ef1a42d.tar.gz
Add support for Active Directory extension policy
Part 3 of Active Directory extension policy support. This CL wires ComponentActiveDirectoryPolicyService up with ActiveDirectoryPolicyManager and unlocks extension policy for Active Directory managed Chrome OS devices (Chromad). It is the final missing link to enable extension policy for Chromad. You can now do all the crazy things you've always been dreaming of like using the Certificate Enrollment for Chrome OS extension to mint client certificates in a PKI environment based off ADCS. BUG=chromium:784595 TEST=browser_tests --gtest_filter=ComponentActiveDirectory* Change-Id: I27aaba07aff9460779b18a01cc88cc338a78f381 Reviewed-on: https://chromium-review.googlesource.com/1057621 Reviewed-by: Alexander Alekseev <alemate@chromium.org> Reviewed-by: Maksim Ivanov <emaxx@chromium.org> Reviewed-by: Pavol Marko <pmarko@chromium.org> Commit-Queue: Lutz Justen <ljusten@chromium.org> Cr-Commit-Position: refs/heads/master@{#561497} CrOS-Libchrome-Original-Commit: a1dae360d82cb7e7e1bce648c22e19d4818eb9fb
Diffstat (limited to 'components')
-rw-r--r--components/policy/core/common/policy_bundle.h2
-rw-r--r--components/policy/core/common/schema_map.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/components/policy/core/common/policy_bundle.h b/components/policy/core/common/policy_bundle.h
index 0b8aa3821f..8a395323ff 100644
--- a/components/policy/core/common/policy_bundle.h
+++ b/components/policy/core/common/policy_bundle.h
@@ -26,7 +26,7 @@ class POLICY_EXPORT PolicyBundle {
PolicyBundle();
virtual ~PolicyBundle();
- // Returns the PolicyMap for namespace |ns|.
+ // Returns the PolicyMap for namespace |ns|. Creates a new map if necessary.
PolicyMap& Get(const PolicyNamespace& ns);
const PolicyMap& Get(const PolicyNamespace& ns) const;
diff --git a/components/policy/core/common/schema_map.h b/components/policy/core/common/schema_map.h
index bf6f85aad6..835941e853 100644
--- a/components/policy/core/common/schema_map.h
+++ b/components/policy/core/common/schema_map.h
@@ -18,6 +18,7 @@ namespace policy {
class PolicyBundle;
+// Maps component id (e.g. extension id) to schema.
typedef std::map<std::string, Schema> ComponentMap;
typedef std::map<PolicyDomain, ComponentMap> DomainMap;