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
parent 894070e4
...@@ -430,9 +430,9 @@ void DeviceSettingsProvider::DecodeKioskPolicies( ...@@ -430,9 +430,9 @@ void DeviceSettingsProvider::DecodeKioskPolicies(
} }
if (it->has_update_url()) if (it->has_update_url())
entry->SetString(policy::AppPackUpdater::kUpdateUrl, it->update_url()); entry->SetString(policy::AppPackUpdater::kUpdateUrl, it->update_url());
if (it->has_key_checksum()) { if (it->has_online_only()) {
entry->SetString(policy::AppPackUpdater::kKeyChecksum, entry->SetBoolean(policy::AppPackUpdater::kOnlineOnly,
it->key_checksum()); it->online_only());
} }
list->Append(entry); list->Append(entry);
} }
......
...@@ -8,6 +8,6 @@ namespace policy { ...@@ -8,6 +8,6 @@ namespace policy {
const char AppPackUpdater::kExtensionId[] = "extension-id"; const char AppPackUpdater::kExtensionId[] = "extension-id";
const char AppPackUpdater::kUpdateUrl[] = "update-url"; const char AppPackUpdater::kUpdateUrl[] = "update-url";
const char AppPackUpdater::kKeyChecksum[] = "key-checksum"; const char AppPackUpdater::kOnlineOnly[] = "online-only";
} // namespace policy } // namespace policy
...@@ -14,7 +14,7 @@ class AppPackUpdater { ...@@ -14,7 +14,7 @@ class AppPackUpdater {
// Keys for the entries in the KioskModeAppPack dictionary policy. // Keys for the entries in the KioskModeAppPack dictionary policy.
static const char kExtensionId[]; static const char kExtensionId[];
static const char kUpdateUrl[]; static const char kUpdateUrl[];
static const char kKeyChecksum[]; static const char kOnlineOnly[];
}; };
} // namespace policy } // namespace policy
......
...@@ -106,7 +106,7 @@ message EphemeralUsersEnabledProto { ...@@ -106,7 +106,7 @@ message EphemeralUsersEnabledProto {
message AppPackEntryProto { message AppPackEntryProto {
optional string extension_id = 1; optional string extension_id = 1;
optional string update_url = 2; optional string update_url = 2;
optional bytes key_checksum = 3; optional bool online_only = 3;
} }
message AppPackProto { message AppPackProto {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment