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

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

Issue 10097007: Make device-level proxy policy mandatory in KIOSK mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « no previous file | 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 536c3821fb22b0380288c99c81ecaceb57b32b74..1c3816764040738dc86ccfa324b1be062b93f5ee 100644
--- a/chrome/browser/policy/device_policy_cache.h
+++ b/chrome/browser/policy/device_policy_cache.h
@@ -79,6 +79,10 @@ class DevicePolicyCache : public CloudPolicyCacheBase {
// that is the case.
void CheckFetchingDone();
+ void DecodeDevicePolicy(
+ const enterprise_management::ChromeDeviceSettingsProto& policy,
+ PolicyMap* policies);
+
// Decode the various groups of policies.
static void DecodeLoginPolicies(
const enterprise_management::ChromeDeviceSettingsProto& policy,
@@ -88,7 +92,8 @@ class DevicePolicyCache : public CloudPolicyCacheBase {
PolicyMap* policies);
static void DecodeNetworkPolicies(
const enterprise_management::ChromeDeviceSettingsProto& policy,
- PolicyMap* policies);
+ PolicyMap* policies,
+ EnterpriseInstallAttributes* install_attributes);
static void DecodeReportingPolicies(
const enterprise_management::ChromeDeviceSettingsProto& policy,
PolicyMap* policies);
@@ -96,10 +101,6 @@ class DevicePolicyCache : public CloudPolicyCacheBase {
const enterprise_management::ChromeDeviceSettingsProto& policy,
PolicyMap* policies);
- static void DecodeDevicePolicy(
- const enterprise_management::ChromeDeviceSettingsProto& policy,
- PolicyMap* policies);
-
CloudPolicyDataStore* data_store_;
EnterpriseInstallAttributes* install_attributes_;
« no previous file with comments | « no previous file | chrome/browser/policy/device_policy_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698