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

Unified Diff: chrome/browser/policy/device_policy_cache.h

Issue 9111022: Removed ConfigurationPolicyType and extended PolicyMap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 11 months 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: chrome/browser/policy/device_policy_cache.h
diff --git a/chrome/browser/policy/device_policy_cache.h b/chrome/browser/policy/device_policy_cache.h
index d7f3c8e0076f4c38b4fc04a9bd59c1da8e8f8243..2157c9b5ee8026cf4b3038cdbc0d49d747abe275 100644
--- a/chrome/browser/policy/device_policy_cache.h
+++ b/chrome/browser/policy/device_policy_cache.h
@@ -53,8 +53,7 @@ class DevicePolicyCache : public CloudPolicyCacheBase {
// CloudPolicyCacheBase implementation:
virtual bool DecodePolicyData(
const enterprise_management::PolicyData& policy_data,
- PolicyMap* mandatory,
- PolicyMap* recommended) OVERRIDE;
+ PolicyMap* policies) OVERRIDE;
void PolicyStoreOpCompleted(chromeos::SignedSettings::ReturnCode code);
@@ -71,8 +70,7 @@ class DevicePolicyCache : public CloudPolicyCacheBase {
static void DecodeDevicePolicy(
const enterprise_management::ChromeDeviceSettingsProto& policy,
- PolicyMap* mandatory,
- PolicyMap* recommended);
+ PolicyMap* policies);
CloudPolicyDataStore* data_store_;
EnterpriseInstallAttributes* install_attributes_;
« no previous file with comments | « chrome/browser/policy/configuration_policy_reader_unittest.cc ('k') | chrome/browser/policy/device_policy_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698