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

Unified Diff: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

Issue 23460030: Clean up device policy definitions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 3 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/chromeos/policy/device_policy_decoder_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
index 252037998125c5ad000fd3549bd2f5a7bd557e83..8821050c45767f8ddac3cd1b55136e7e49aafeb2 100644
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
@@ -144,11 +144,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,
chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppId,
entry->kiosk_app().app_id());
}
- if (entry->kiosk_app().has_update_url()) {
- entry_dict->SetStringWithoutPathExpansion(
- chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL,
- entry->kiosk_app().update_url());
- }
} else if (entry->has_deprecated_public_session_id()) {
// Deprecated public session specification.
entry_dict->SetStringWithoutPathExpansion(
@@ -459,6 +454,15 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy,
NULL);
}
+ if (container.has_http_downloads_enabled()) {
+ policies->Set(
+ key::kDeviceUpdateHttpDownloadsEnabled,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ Value::CreateBooleanValue(container.http_downloads_enabled()),
+ NULL);
+ }
+
if (container.has_reboot_after_update()) {
policies->Set(key::kRebootAfterUpdate,
POLICY_LEVEL_MANDATORY,
« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account.cc ('k') | chrome/browser/chromeos/settings/cros_settings_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698