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

Side by Side Diff: chrome/browser/policy/proto/chrome_device_policy.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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 123
124 // Specifies the duration of a warning countdown before the user is logged out 124 // Specifies the duration of a warning countdown before the user is logged out
125 // because of idleness as specified by the |idle_logout_timeout| value. 125 // because of idleness as specified by the |idle_logout_timeout| value.
126 // This field is only used if |idle_logout_timeout| != 0 is specified. 126 // This field is only used if |idle_logout_timeout| != 0 is specified.
127 optional int64 idle_logout_warning_duration = 2; 127 optional int64 idle_logout_warning_duration = 2;
128 } 128 }
129 129
130 message ScreenSaverProto { 130 message ScreenSaverProto {
131 // Specifies the extension ID which is to be used as a screen saver on the 131 // Specifies the extension ID which is to be used as a screen saver on the
132 // login screen if no user activity is present. Only respected if the device 132 // login screen if no user activity is present. Only respected if the device
133 // is in KIOSK mode. 133 // is in RETAIL mode.
134 optional string screen_saver_extension_id = 1; 134 optional string screen_saver_extension_id = 1;
135 135
136 // Specifies the timeout before the screen saver is activated. If this field 136 // Specifies the timeout before the screen saver is activated. If this field
137 // is omitted or set to 0, no screen-saver will be started. 137 // is omitted or set to 0, no screen-saver will be started.
138 // Measured in milliseconds. 138 // Measured in milliseconds.
139 optional int64 screen_saver_timeout = 2; 139 optional int64 screen_saver_timeout = 2;
140 } 140 }
141 141
142 // Enterprise controls for auto-update behavior of Chrome OS. 142 // Enterprise controls for auto-update behavior of Chrome OS.
143 message AutoUpdateSettingsProto { 143 message AutoUpdateSettingsProto {
(...skipping 11 matching lines...) Expand all
155 // "" (or not set at all): update to latest version available. 155 // "" (or not set at all): update to latest version available.
156 // 1412.: update to any minor version of 1412 (e.g. 1412.24.34 or 1412.60.2) 156 // 1412.: update to any minor version of 1412 (e.g. 1412.24.34 or 1412.60.2)
157 // 1412.2.: update to any minor version of 1412.2 (e.g. 1412.2.34 or 1412.2.2) 157 // 1412.2.: update to any minor version of 1412.2 (e.g. 1412.2.34 or 1412.2.2)
158 // 1412.24.34: update to this specific version only 158 // 1412.24.34: update to this specific version only
159 // --------------------------------------------------------------------- 159 // ---------------------------------------------------------------------
160 optional string target_version_prefix = 2; 160 optional string target_version_prefix = 2;
161 } 161 }
162 162
163 message StartUpUrlsProto { 163 message StartUpUrlsProto {
164 // Specifies the URLs to be loaded on login to the anonymous account used if 164 // Specifies the URLs to be loaded on login to the anonymous account used if
165 // the device is in KIOSK mode. 165 // the device is in RETAIL mode.
166 repeated string start_up_urls = 1; 166 repeated string start_up_urls = 1;
167 } 167 }
168 168
169 message ChromeDeviceSettingsProto { 169 message ChromeDeviceSettingsProto {
170 optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1; 170 optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1;
171 optional UserWhitelistProto user_whitelist = 2; 171 optional UserWhitelistProto user_whitelist = 2;
172 optional GuestModeEnabledProto guest_mode_enabled = 3; 172 optional GuestModeEnabledProto guest_mode_enabled = 3;
173 optional DeviceProxySettingsProto device_proxy_settings = 4; 173 optional DeviceProxySettingsProto device_proxy_settings = 4;
174 optional CameraEnabledProto camera_enabled = 5; 174 optional CameraEnabledProto camera_enabled = 5;
175 optional ShowUserNamesOnSigninProto show_user_names = 6; 175 optional ShowUserNamesOnSigninProto show_user_names = 6;
176 optional DataRoamingEnabledProto data_roaming_enabled = 7; 176 optional DataRoamingEnabledProto data_roaming_enabled = 7;
177 optional AllowNewUsersProto allow_new_users = 8; 177 optional AllowNewUsersProto allow_new_users = 8;
178 optional MetricsEnabledProto metrics_enabled = 9; 178 optional MetricsEnabledProto metrics_enabled = 9;
179 optional ReleaseChannelProto release_channel = 10; 179 optional ReleaseChannelProto release_channel = 10;
180 optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11; 180 optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11;
181 optional DeviceReportingProto device_reporting = 12; 181 optional DeviceReportingProto device_reporting = 12;
182 optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13; 182 optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13;
183 optional AppPackProto app_pack = 14; 183 optional AppPackProto app_pack = 14;
184 optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15; 184 optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15;
185 optional ScreenSaverProto login_screen_saver = 16; 185 optional ScreenSaverProto login_screen_saver = 16;
186 optional AutoUpdateSettingsProto auto_update_settings = 17; 186 optional AutoUpdateSettingsProto auto_update_settings = 17;
187 optional StartUpUrlsProto start_up_urls = 18; 187 optional StartUpUrlsProto start_up_urls = 18;
188 } 188 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/device_token_fetcher_unittest.cc ('k') | chrome/browser/policy/proto/device_management_backend.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698