| Index: chrome/browser/chromeos/policy/login_profile_policy_provider.cc
|
| diff --git a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
|
| index 5eefa6b57bca93b009aefc6860af113c6c0cc74c..9fc74fcbf94a8cf67a0953bace62ad3670ce2c08 100644
|
| --- a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
|
| +++ b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
|
| @@ -10,8 +10,10 @@
|
| #include "base/callback.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/values.h"
|
| +#include "chrome/browser/chromeos/policy/login_screen_power_management_policy.h"
|
| #include "chrome/browser/policy/external_data_fetcher.h"
|
| #include "chrome/browser/policy/policy_bundle.h"
|
| +#include "chrome/browser/policy/policy_error_map.h"
|
| #include "chrome/browser/policy/policy_map.h"
|
| #include "chrome/browser/policy/policy_types.h"
|
| #include "policy/policy_constants.h"
|
| @@ -23,10 +25,10 @@ namespace {
|
| // Applies the value of |device_policy| in |device_policy_map| as the
|
| // recommended value of |user_policy| in |user_policy_map|. If the value of
|
| // |device_policy| is unset, does nothing.
|
| -void ApplyDevicePolicy(const std::string& device_policy,
|
| - const std::string& user_policy,
|
| - const PolicyMap& device_policy_map,
|
| - PolicyMap* user_policy_map) {
|
| +void ApplyDevicePolicyAsRecommendedPolicy(const std::string& device_policy,
|
| + const std::string& user_policy,
|
| + const PolicyMap& device_policy_map,
|
| + PolicyMap* user_policy_map) {
|
| const base::Value* value = device_policy_map.GetValue(device_policy);
|
| if (value) {
|
| user_policy_map->Set(user_policy,
|
| @@ -37,6 +39,20 @@ void ApplyDevicePolicy(const std::string& device_policy,
|
| }
|
| }
|
|
|
| +// Applies |value| as the mandatory value of |user_policy| in |user_policy_map|.
|
| +// If |value| is NULL, does nothing.
|
| +void ApplyValueAsMandatoryPolicy(const base::Value* value,
|
| + const std::string& user_policy,
|
| + PolicyMap* user_policy_map) {
|
| + if (value) {
|
| + user_policy_map->Set(user_policy,
|
| + POLICY_LEVEL_MANDATORY,
|
| + POLICY_SCOPE_USER,
|
| + value->DeepCopy(),
|
| + NULL);
|
| + }
|
| +}
|
| +
|
| } // namespace
|
|
|
| LoginProfilePolicyProvider::LoginProfilePolicyProvider(
|
| @@ -99,18 +115,67 @@ void LoginProfilePolicyProvider::UpdateFromDevicePolicy() {
|
| scoped_ptr<PolicyBundle> bundle(new PolicyBundle);
|
| PolicyMap& user_policy_map = bundle->Get(chrome_namespaces);
|
|
|
| - ApplyDevicePolicy(key::kDeviceLoginScreenDefaultLargeCursorEnabled,
|
| - key::kLargeCursorEnabled,
|
| - device_policy_map, &user_policy_map);
|
| - ApplyDevicePolicy(key::kDeviceLoginScreenDefaultSpokenFeedbackEnabled,
|
| - key::kSpokenFeedbackEnabled,
|
| - device_policy_map, &user_policy_map);
|
| - ApplyDevicePolicy(key::kDeviceLoginScreenDefaultHighContrastEnabled,
|
| - key::kHighContrastEnabled,
|
| - device_policy_map, &user_policy_map);
|
| - ApplyDevicePolicy(key::kDeviceLoginScreenDefaultScreenMagnifierType,
|
| - key::kScreenMagnifierType,
|
| - device_policy_map, &user_policy_map);
|
| + ApplyDevicePolicyAsRecommendedPolicy(
|
| + key::kDeviceLoginScreenDefaultLargeCursorEnabled,
|
| + key::kLargeCursorEnabled,
|
| + device_policy_map, &user_policy_map);
|
| + ApplyDevicePolicyAsRecommendedPolicy(
|
| + key::kDeviceLoginScreenDefaultSpokenFeedbackEnabled,
|
| + key::kSpokenFeedbackEnabled,
|
| + device_policy_map, &user_policy_map);
|
| + ApplyDevicePolicyAsRecommendedPolicy(
|
| + key::kDeviceLoginScreenDefaultHighContrastEnabled,
|
| + key::kHighContrastEnabled,
|
| + device_policy_map, &user_policy_map);
|
| + ApplyDevicePolicyAsRecommendedPolicy(
|
| + key::kDeviceLoginScreenDefaultScreenMagnifierType,
|
| + key::kScreenMagnifierType,
|
| + device_policy_map, &user_policy_map);
|
| +
|
| + // TODO(bartfab): Consolidate power management user policies into a single
|
| + // JSON policy, allowing the value of the device policy to be simply forwarded
|
| + // here. http://crbug.com/258339
|
| + const base::Value* value =
|
| + device_policy_map.GetValue(key::kDeviceLoginScreenPowerManagement);
|
| + std::string json;
|
| + if (value && value->GetAsString(&json)) {
|
| + LoginScreenPowerManagementPolicy power_management_policy;
|
| + power_management_policy.Init(json, NULL);
|
| + ApplyValueAsMandatoryPolicy(power_management_policy.GetScreenDimDelayAC(),
|
| + key::kScreenDimDelayAC,
|
| + &user_policy_map);
|
| + ApplyValueAsMandatoryPolicy(power_management_policy.GetScreenOffDelayAC(),
|
| + key::kScreenOffDelayAC,
|
| + &user_policy_map);
|
| + ApplyValueAsMandatoryPolicy(power_management_policy.GetIdleDelayAC(),
|
| + key::kIdleDelayAC,
|
| + &user_policy_map);
|
| + ApplyValueAsMandatoryPolicy(
|
| + power_management_policy.GetScreenDimDelayBattery(),
|
| + key::kScreenDimDelayBattery,
|
| + &user_policy_map);
|
| + ApplyValueAsMandatoryPolicy(
|
| + power_management_policy.GetScreenOffDelayBattery(),
|
| + key::kScreenOffDelayBattery,
|
| + &user_policy_map);
|
| + ApplyValueAsMandatoryPolicy(power_management_policy.GetIdleDelayBattery(),
|
| + key::kIdleDelayBattery,
|
| + &user_policy_map);
|
| + ApplyValueAsMandatoryPolicy(power_management_policy.GetIdleActionAC(),
|
| + key::kIdleActionAC,
|
| + &user_policy_map);
|
| + ApplyValueAsMandatoryPolicy(power_management_policy.GetIdleActionBattery(),
|
| + key::kIdleActionBattery,
|
| + &user_policy_map);
|
| + ApplyValueAsMandatoryPolicy(power_management_policy.GetLidCloseAction(),
|
| + key::kLidCloseAction,
|
| + &user_policy_map);
|
| + ApplyValueAsMandatoryPolicy(
|
| + power_management_policy.GetUserActivityScreenDimDelayScale(),
|
| + key::kUserActivityScreenDimDelayScale,
|
| + &user_policy_map);
|
| + }
|
| +
|
| UpdatePolicy(bundle.Pass());
|
| }
|
|
|
|
|