Index: components/policy/core/browser/configuration_policy_handler_list.h |
diff --git a/components/policy/core/browser/configuration_policy_handler_list.h b/components/policy/core/browser/configuration_policy_handler_list.h |
index a130e6fc50077bedd132f3fa31a1372a849ba134..933dfbe4f9947acec81839edc2df81f98e4b2c7a 100644 |
--- a/components/policy/core/browser/configuration_policy_handler_list.h |
+++ b/components/policy/core/browser/configuration_policy_handler_list.h |
@@ -11,6 +11,7 @@ |
#include "base/callback.h" |
#include "base/macros.h" |
#include "components/policy/core/common/policy_details.h" |
+#include "components/policy/core/common/policy_map.h" |
#include "components/policy/policy_export.h" |
class PrefValueMap; |
@@ -20,13 +21,12 @@ namespace policy { |
class ConfigurationPolicyHandler; |
class PolicyErrorMap; |
struct PolicyHandlerParameters; |
-class PolicyMap; |
struct PolicyToPreferenceMapEntry; |
class Schema; |
// Converts policies to their corresponding preferences by applying a list of |
-// ConfigurationPolicyHandler objects. This includes error checking and |
-// cleaning up policy values for displaying. |
+// ConfigurationPolicyHandler objects. This includes error checking and cleaning |
+// up policy values for display. |
class POLICY_EXPORT ConfigurationPolicyHandlerList { |
public: |
typedef base::Callback<void(PolicyHandlerParameters*)> |
@@ -40,9 +40,9 @@ class POLICY_EXPORT ConfigurationPolicyHandlerList { |
// Adds a policy handler to the list. |
void AddHandler(std::unique_ptr<ConfigurationPolicyHandler> handler); |
- // Translates |policies| to their corresponding preferences in |prefs|. |
- // Any errors found while processing the policies are stored in |errors|. |
- // |prefs| or |errors| can be NULL, and won't be filled in that case. |
+ // Translates |policies| to their corresponding preferences in |prefs|. Any |
+ // errors found while processing the policies are stored in |errors|. |prefs| |
+ // or |errors| can be nullptr, and won't be filled in that case. |
void ApplyPolicySettings(const PolicyMap& policies, |
PrefValueMap* prefs, |
PolicyErrorMap* errors) const; |
@@ -51,6 +51,8 @@ class POLICY_EXPORT ConfigurationPolicyHandlerList { |
void PrepareForDisplaying(PolicyMap* policies) const; |
private: |
+ bool IsPlatformDevicePolicy(const PolicyMap::const_iterator iter) const; |
+ |
std::vector<ConfigurationPolicyHandler*> handlers_; |
const PopulatePolicyHandlerParametersCallback parameters_callback_; |
const GetChromePolicyDetailsCallback details_callback_; |