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

Unified Diff: chrome/browser/policy/proto/device_management_backend.proto

Issue 6840014: Support decoding GenericNamedValue based policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit test broken by patch set 2 Created 9 years, 8 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/policy/proto/device_management_backend.proto
diff --git a/chrome/browser/policy/proto/device_management_backend.proto b/chrome/browser/policy/proto/device_management_backend.proto
index 4b45f7b6232fba61ff74cc9232c7b0401513ed8f..9d3923fd7d711bac8d10c579614e053a7996c74a 100644
--- a/chrome/browser/policy/proto/device_management_backend.proto
+++ b/chrome/browser/policy/proto/device_management_backend.proto
@@ -24,57 +24,6 @@ message ChromeInitialSettingsProto {
optional EnrollmentProvision enrollment_provision = 1 [default = UNMANAGED];
}
-// A setting is a set of generic name value pairs.
-// TODO(gfeher): remove this after Chrome OS TT is over.
-message GenericSetting {
- repeated GenericNamedValue named_value = 1;
-}
-
-// Generic value container.
-message GenericValue {
- enum ValueType {
- VALUE_TYPE_BOOL = 1;
- VALUE_TYPE_INT64 = 2;
- VALUE_TYPE_STRING = 3;
- VALUE_TYPE_DOUBLE = 4;
- VALUE_TYPE_BYTES = 5;
- VALUE_TYPE_BOOL_ARRAY = 6;
- VALUE_TYPE_INT64_ARRAY = 7;
- VALUE_TYPE_STRING_ARRAY = 8;
- VALUE_TYPE_DOUBLE_ARRAY = 9;
- }
-
- optional ValueType value_type = 1 [default = VALUE_TYPE_STRING];
-
- // basic value types
- optional bool bool_value = 2;
- optional int64 int64_value = 3;
- optional string string_value = 4;
- optional double double_value = 5;
- optional bytes bytes_value = 6;
- repeated bool bool_array = 7;
- repeated int64 int64_array = 8;
- repeated string string_array = 9;
- repeated double double_array = 10;
-}
-
-// Generic name value pair container.
-message GenericNamedValue {
- required string name = 1;
- optional GenericValue value = 2;
-}
-
-// Identify a single device policy setting key/value pair.
-// TODO(gfeher): remove this after Chrome OS TT is over.
-message DevicePolicySetting {
- // key of the policy setting
- required string policy_key = 1;
- // value of the setting
- optional GenericSetting policy_value = 2;
- // watermark for setting value.
- optional string watermark = 3;
-}
-
// Request from device to server to register device.
message DeviceRegisterRequest {
// Reregister device without erasing server state. It can be used
@@ -257,10 +206,6 @@ message DevicePolicyRequest {
// Response from server to device for reading policies.
message DevicePolicyResponse {
- // the result of the settings.
- // TODO(gfeher): remove this after Chrome OS TT is over.
- repeated DevicePolicySetting setting = 1;
-
// The policy fetch response.
repeated PolicyFetchResponse response = 3;
}
« no previous file with comments | « chrome/browser/policy/device_management_service_unittest.cc ('k') | chrome/browser/policy/proto/old_generic_format.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698