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

Side by Side Diff: chrome/browser/policy/proto/device_management_backend.proto

Issue 9814011: Rename enterprise policy proto fields from KIOSK to RETAIL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed compilation and addressed comments. Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 syntax = "proto2"; 5 syntax = "proto2";
6 6
7 option optimize_for = LITE_RUNTIME; 7 option optimize_for = LITE_RUNTIME;
8 8
9 package enterprise_management; 9 package enterprise_management;
10 10
(...skipping 20 matching lines...) Expand all
31 31
32 // Machine hardware id, such as serial number. 32 // Machine hardware id, such as serial number.
33 // This field is required if register type == DEVICE. 33 // This field is required if register type == DEVICE.
34 optional string machine_id = 3; 34 optional string machine_id = 3;
35 35
36 // Machine model name, such as "ZGA", "Cr-48", "Nexus One". If the 36 // Machine model name, such as "ZGA", "Cr-48", "Nexus One". If the
37 // model name is not available, client SHOULD send generic name like 37 // model name is not available, client SHOULD send generic name like
38 // "Android", or "Chrome OS". 38 // "Android", or "Chrome OS".
39 optional string machine_model = 4; 39 optional string machine_model = 4;
40 40
41 // When true, indicates that the |machine_id| field should be known to the 41 // When true, indicates that the |machine_id| has been identified as auto-
42 // server. The server can do additional checks based on this information. 42 // enrollment candidate on the client and the server can use it to verify
43 // This is currently used for requests triggered by auto-enrollment. 43 // that the client is to be enrolled in the correct mode.
44 // Defaults to false when not present. 44 // Defaults to false when not present.
45 optional bool known_machine_id = 5; 45 optional bool auto_enrolled = 5;
46 } 46 }
47 47
48 // Response from server to device register request. 48 // Response from server to device register request.
49 message DeviceRegisterResponse { 49 message DeviceRegisterResponse {
50 // Device management token for this registration. This token MUST be 50 // Device management token for this registration. This token MUST be
51 // part of HTTP Authorization header for all future requests from 51 // part of HTTP Authorization header for all future requests from
52 // device to server. 52 // device to server.
53 required string device_management_token = 1; 53 required string device_management_token = 1;
54 54
55 // Device display name. By default, server generates the name in 55 // Device display name. By default, server generates the name in
56 // the format of "Machine Model - Machine Id". However, domain 56 // the format of "Machine Model - Machine Id". However, domain
57 // admin can update it using CPanel, so do NOT treat it as constant. 57 // admin can update it using CPanel, so do NOT treat it as constant.
58 optional string machine_name = 2; 58 optional string machine_name = 2;
59 59
60 // Enum listing the possible modes the device should be locked into when the 60 // Enum listing the possible modes the device should be locked into when the
61 // registration is finished. 61 // registration is finished.
62 enum DeviceMode { 62 enum DeviceMode {
63 // In ENTERPRISE mode the device has no local owner and device settings are 63 // In ENTERPRISE mode the device has no local owner and device settings are
64 // controlled through the cloud policy infrastructure. Auto-enrollment is 64 // controlled through the cloud policy infrastructure. Auto-enrollment is
65 // supported in that mode. 65 // supported in that mode.
66 ENTERPRISE = 0; 66 ENTERPRISE = 0;
67 // Devices in KIOSK mode also have no local owner and get their device 67 // Devices in RETAIL mode also have no local owner and get their device
68 // settings from the cloud, but additionally this mode enables the demo 68 // settings from the cloud, but additionally this mode enables the demo
69 // account on the device. 69 // account on the device.
70 KIOSK = 1; 70 RETAIL = 1;
71 } 71 }
72 optional DeviceMode enrollment_type = 3 [default = ENTERPRISE]; 72 optional DeviceMode enrollment_type = 3 [default = ENTERPRISE];
73 } 73 }
74 74
75 // Request from device to server to unregister device. 75 // Request from device to server to unregister device.
76 // GoogleDMToken MUST be in HTTP Authorization header. 76 // GoogleDMToken MUST be in HTTP Authorization header.
77 message DeviceUnregisterRequest { 77 message DeviceUnregisterRequest {
78 } 78 }
79 79
80 // Response from server to device for unregister request. 80 // Response from server to device for unregister request.
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 444
445 // Device status report response. 445 // Device status report response.
446 optional DeviceStatusReportResponse device_status_report_response = 6; 446 optional DeviceStatusReportResponse device_status_report_response = 6;
447 447
448 // Session status report response. 448 // Session status report response.
449 optional SessionStatusReportResponse session_status_report_response = 7; 449 optional SessionStatusReportResponse session_status_report_response = 7;
450 450
451 // Auto-enrollment detection response. 451 // Auto-enrollment detection response.
452 optional DeviceAutoEnrollmentResponse auto_enrollment_response = 8; 452 optional DeviceAutoEnrollmentResponse auto_enrollment_response = 8;
453 } 453 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/proto/chrome_device_policy.proto ('k') | net/tools/testserver/device_management.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698