Make device-level proxy policy mandatory in KIOSK mode.

chrome/browser/policy/device_policy_cache.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/device_policy_cache.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 329 matching lines @@
   SetReady();
 }
 
 void DevicePolicyCache::CheckFetchingDone() {
   if (policy_fetch_pending_) {
     CloudPolicyCacheBase::SetFetchingDone();
     policy_fetch_pending_ = false;
   }
 }
 
+void DevicePolicyCache::DecodeDevicePolicy(
+    const em::ChromeDeviceSettingsProto& policy,
+    PolicyMap* policies) {
+  // Decode the various groups of policies.
+  DecodeLoginPolicies(policy, policies);
+  DecodeKioskPolicies(policy, policies);
+  DecodeNetworkPolicies(policy, policies, install_attributes_);
+  DecodeReportingPolicies(policy, policies);
+  DecodeGenericPolicies(policy, policies);
+}
+
 // static
 void DevicePolicyCache::DecodeLoginPolicies(
     const em::ChromeDeviceSettingsProto& policy,
     PolicyMap* policies) {
   if (policy.has_guest_mode_enabled()) {
     const em::GuestModeEnabledProto& container(policy.guest_mode_enabled());
     if (container.has_guest_mode_enabled()) {
       policies->Set(key::kDeviceGuestModeEnabled,
                     POLICY_LEVEL_MANDATORY,
                     POLICY_SCOPE_MACHINE,
@@ skipping 106 matching lines @@
     policies->Set(key::kDeviceAppPack,
                   POLICY_LEVEL_MANDATORY,
                   POLICY_SCOPE_MACHINE,
                   app_pack_list);
   }
 }
 
 // static
 void DevicePolicyCache::DecodeNetworkPolicies(
     const em::ChromeDeviceSettingsProto& policy,
-    PolicyMap* policies) {
+    PolicyMap* policies,
+    EnterpriseInstallAttributes* install_attributes) {
   if (policy.has_device_proxy_settings()) {
     const em::DeviceProxySettingsProto& container(
         policy.device_proxy_settings());
     scoped_ptr<DictionaryValue> proxy_settings(new DictionaryValue);
     if (container.has_proxy_mode())
       proxy_settings->SetString(key::kProxyMode, container.proxy_mode());
     if (container.has_proxy_server())
       proxy_settings->SetString(key::kProxyServer, container.proxy_server());
     if (container.has_proxy_pac_url())
       proxy_settings->SetString(key::kProxyPacUrl, container.proxy_pac_url());
     if (container.has_proxy_bypass_list()) {
       proxy_settings->SetString(key::kProxyBypassList,
                                 container.proxy_bypass_list());
     }
+
+    // Figure out the level. Proxy policy is mandatory in kiosk mode.
+    PolicyLevel level = POLICY_LEVEL_RECOMMENDED;
+    if (install_attributes->GetMode() == DEVICE_MODE_KIOSK)
+      level = POLICY_LEVEL_MANDATORY;
+
     if (!proxy_settings->empty()) {
       policies->Set(key::kProxySettings,
-                    POLICY_LEVEL_RECOMMENDED,
+                    level,
                     POLICY_SCOPE_MACHINE,
                     proxy_settings.release());
     }
   }
 
   if (policy.has_data_roaming_enabled()) {
     const em::DataRoamingEnabledProto& container(policy.data_roaming_enabled());
     if (container.has_data_roaming_enabled()) {
       policies->Set(key::kDeviceDataRoamingEnabled,
                     POLICY_LEVEL_MANDATORY,
@@ skipping 125 matching lines @@
         urls->Append(Value::CreateStringValue(*entry));
       }
       policies->Set(key::kDeviceStartUpUrls,
                     POLICY_LEVEL_MANDATORY,
                     POLICY_SCOPE_MACHINE,
                     urls);
     }
   }
 }
 
-// static
-void DevicePolicyCache::DecodeDevicePolicy(
-    const em::ChromeDeviceSettingsProto& policy,
-    PolicyMap* policies) {
-  // Decode the various groups of policies.
-  DecodeLoginPolicies(policy, policies);
-  DecodeKioskPolicies(policy, policies);
-  DecodeNetworkPolicies(policy, policies);
-  DecodeReportingPolicies(policy, policies);
-  DecodeGenericPolicies(policy, policies);
-}
-
 }  // namespace policy