From ef69c359c9512950e2dc1685c4e31ee329335263 Mon Sep 17 00:00:00 2001 From: "joaodasilva@chromium.org" Date: Thu, 15 Mar 2012 10:34:28 +0000 Subject: Updated the chrome_device_policy.proto, and AppPack decoding. Removed the key-checksum field (which is unnecessary), and added the online-only field. BUG=chromium-os:25463 TEST=All works as before Review URL: http://codereview.chromium.org/9691046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126882 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chromeos/device_settings_provider.cc | 6 +++--- chrome/browser/policy/app_pack_updater.cc | 2 +- chrome/browser/policy/app_pack_updater.h | 2 +- chrome/browser/policy/proto/chrome_device_policy.proto | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/chromeos/device_settings_provider.cc b/chrome/browser/chromeos/device_settings_provider.cc index 21750c4..5aadaf2 100644 --- a/chrome/browser/chromeos/device_settings_provider.cc +++ b/chrome/browser/chromeos/device_settings_provider.cc @@ -430,9 +430,9 @@ void DeviceSettingsProvider::DecodeKioskPolicies( } if (it->has_update_url()) entry->SetString(policy::AppPackUpdater::kUpdateUrl, it->update_url()); - if (it->has_key_checksum()) { - entry->SetString(policy::AppPackUpdater::kKeyChecksum, - it->key_checksum()); + if (it->has_online_only()) { + entry->SetBoolean(policy::AppPackUpdater::kOnlineOnly, + it->online_only()); } list->Append(entry); } diff --git a/chrome/browser/policy/app_pack_updater.cc b/chrome/browser/policy/app_pack_updater.cc index c7d1faa..d9e4b10 100644 --- a/chrome/browser/policy/app_pack_updater.cc +++ b/chrome/browser/policy/app_pack_updater.cc @@ -8,6 +8,6 @@ namespace policy { const char AppPackUpdater::kExtensionId[] = "extension-id"; const char AppPackUpdater::kUpdateUrl[] = "update-url"; -const char AppPackUpdater::kKeyChecksum[] = "key-checksum"; +const char AppPackUpdater::kOnlineOnly[] = "online-only"; } // namespace policy diff --git a/chrome/browser/policy/app_pack_updater.h b/chrome/browser/policy/app_pack_updater.h index 741a3c4..86c7f9c 100644 --- a/chrome/browser/policy/app_pack_updater.h +++ b/chrome/browser/policy/app_pack_updater.h @@ -14,7 +14,7 @@ class AppPackUpdater { // Keys for the entries in the KioskModeAppPack dictionary policy. static const char kExtensionId[]; static const char kUpdateUrl[]; - static const char kKeyChecksum[]; + static const char kOnlineOnly[]; }; } // namespace policy diff --git a/chrome/browser/policy/proto/chrome_device_policy.proto b/chrome/browser/policy/proto/chrome_device_policy.proto index 338e3fc..42fa2e2 100644 --- a/chrome/browser/policy/proto/chrome_device_policy.proto +++ b/chrome/browser/policy/proto/chrome_device_policy.proto @@ -106,7 +106,7 @@ message EphemeralUsersEnabledProto { message AppPackEntryProto { optional string extension_id = 1; optional string update_url = 2; - optional bytes key_checksum = 3; + optional bool online_only = 3; } message AppPackProto { -- cgit v1.1