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

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

Issue 6869042: Add immutable settings checks when handling policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, address comments Created 9 years, 8 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
« no previous file with comments | « chrome/browser/policy/browser_policy_connector.cc ('k') | chrome/browser/policy/device_policy_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 36028394b53808eb26b79ab0e63dd7499fd5955d..ce29c972924d02a6f3c8b444385ff9b6f25815d3 100644
--- a/chrome/browser/policy/device_policy_cache.h
+++ b/chrome/browser/policy/device_policy_cache.h
@@ -17,6 +17,7 @@
namespace policy {
class DevicePolicyIdentityStrategy;
+class EnterpriseInstallAttributes;
class PolicyMap;
namespace em = enterprise_management;
@@ -26,7 +27,8 @@ namespace em = enterprise_management;
class DevicePolicyCache : public CloudPolicyCacheBase,
public chromeos::SignedSettingsHelper::Callback {
public:
- explicit DevicePolicyCache(DevicePolicyIdentityStrategy* identity_strategy);
+ explicit DevicePolicyCache(DevicePolicyIdentityStrategy* identity_strategy,
+ EnterpriseInstallAttributes* install_attributes);
virtual ~DevicePolicyCache();
// CloudPolicyCacheBase implementation:
@@ -46,6 +48,7 @@ class DevicePolicyCache : public CloudPolicyCacheBase,
// singleton.
DevicePolicyCache(
DevicePolicyIdentityStrategy* identity_strategy,
+ EnterpriseInstallAttributes* install_attributes,
chromeos::SignedSettingsHelper* signed_settings_helper);
// CloudPolicyCacheBase implementation:
@@ -55,11 +58,16 @@ class DevicePolicyCache : public CloudPolicyCacheBase,
void PolicyStoreOpCompleted(chromeos::SignedSettings::ReturnCode code);
+ // Checks with immutable attributes whether this is an enterprise device and
+ // read the registration user if this is the case.
+ void CheckImmutableAttributes();
+
static void DecodeDevicePolicy(const em::ChromeDeviceSettingsProto& policy,
PolicyMap* mandatory,
PolicyMap* recommended);
DevicePolicyIdentityStrategy* identity_strategy_;
+ EnterpriseInstallAttributes* install_attributes_;
chromeos::SignedSettingsHelper* signed_settings_helper_;
« no previous file with comments | « chrome/browser/policy/browser_policy_connector.cc ('k') | chrome/browser/policy/device_policy_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698