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

Side by Side Diff: chrome/browser/policy/proto/chromeos/chrome_device_policy.proto

Issue 14306004: Put Kiosk App parameters into device settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 7 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 // that are equivalent to one of the timezones in "timezone_settings.cc" are 217 // that are equivalent to one of the timezones in "timezone_settings.cc" are
218 // valid. In case of an invalid value, the setting is still activated with a 218 // valid. In case of an invalid value, the setting is still activated with a
219 // fallback timezone (currently "GMT"). In case of an empty string or if no 219 // fallback timezone (currently "GMT"). In case of an empty string or if no
220 // value is provided, the timezone device setting is inactive. In that case, 220 // value is provided, the timezone device setting is inactive. In that case,
221 // the currently active timezone will remain in use however users can change 221 // the currently active timezone will remain in use however users can change
222 // the timezone and the change is persistent. Thus a change by one user 222 // the timezone and the change is persistent. Thus a change by one user
223 // affects the login-screen and all other users. 223 // affects the login-screen and all other users.
224 optional string timezone = 1; 224 optional string timezone = 1;
225 } 225 }
226 226
227 // Parameters for Kiosk App device-local accounts.
228 message KioskAppInfoProto {
229 // Indicates the Kiosk App for the corresponding device-local account. The
230 // string value should be a valid 32-character Chrome App identifier and
231 // specifies the Kiosk App to download and run.
232 optional string app_id = 1;
233
234 // Optional extension update URL to download the Kiosk App package from. If
235 // not specified, the app will be downloaded from the standard Chrome Web
236 // Store update URL.
237 optional string update_url = 2;
238 }
239
227 // Describes a single device-local account. 240 // Describes a single device-local account.
228 message DeviceLocalAccountInfoProto { 241 message DeviceLocalAccountInfoProto {
229 // Identifier for the device-local account. Account identifiers loosely follow 242 // Deprecated: Account identifier for a public session device-local account.
230 // the conventions for email addresses as specified by RFC 5322, e.g. local 243 // Old code didn't have the |type| field, so it can't handle new types of
231 // (user name) and domain parts, separated by the '@' character. 244 // device-local accounts gracefully (i.e. ignoring unsupported types). New
232 // Policy-configured device-local accounts are on the same domain that the 245 // code should instead set type to ACCOUNT_TYPE_PUBLIC_SESSION and write the
233 // device is enrolled to. In contrast to RFC 5322 (which is more restrictive), 246 // identifier to the |account_id| field below. If the |type| field is present,
234 // the local part may contain any characters other than '@'. 247 // |deprecated_public_session_id| will be ignored.
248 // TODO(mnissler): Rename this field to indicate it's deprecated.
235 optional string id = 1; 249 optional string id = 1;
250
251 // Identifier for the device-local account. This is an opaque identifier that
252 // is used to distinguish different device-local accounts configured. All
253 // configured accounts on a device must have unique identifiers.
254 optional string account_id = 2;
255
256 // Indicates the type of device-local account.
257 enum AccountType {
258 // A login-less, policy-configured browsing session.
259 ACCOUNT_TYPE_PUBLIC_SESSION = 0;
260 // An account that serves as a container for a single full-screen app.
261 ACCOUNT_TYPE_KIOSK_APP = 1;
262 };
263
264 // The account type.
265 optional AccountType type = 3;
266
267 // Kiosk App parameters, relevant if |type| is ACCOUNT_TYPE_KIOSK_APP.
268 optional KioskAppInfoProto kiosk_app = 4;
236 } 269 }
237 270
238 message DeviceLocalAccountsProto { 271 message DeviceLocalAccountsProto {
239 // The list of device-local accounts (i.e. accounts without an associated 272 // The list of device-local accounts (i.e. accounts without an associated
240 // cloud-backed profile) that are available on the device. 273 // cloud-backed profile) that are available on the device.
241 repeated DeviceLocalAccountInfoProto account = 1; 274 repeated DeviceLocalAccountInfoProto account = 1;
242 275
243 // The identifier of the device-local account to which the device 276 // The identifier of the device-local account to which the device
244 // should be logged in automatically. Should be equal to one of the 277 // should be logged in automatically. Should be equal to one of the
245 // ids in DeviceLocalAccountInfoProto. 278 // ids in DeviceLocalAccountInfoProto.
246 optional string auto_login_id = 2; 279 optional string auto_login_id = 2;
247 280
248 // The amount of time, in milliseconds, that should elapse at the signin 281 // The amount of time, in milliseconds, that should elapse at the signin
249 // screen without user interaction before automatically logging in. 282 // screen without user interaction before automatically logging in.
250 optional int64 auto_login_delay = 3; 283 optional int64 auto_login_delay = 3;
284
285 // Whether the keyboard shortcut to prevent zero-delay auto-login should be
286 // enabled or not. If this keyboard shortcut is engaged, the auto-login will
287 // be delayed by 3 minutes so administrators can log in or make configuration
288 // changes.
289 optional bool enable_auto_login_bailout = 4 [default = true];
251 } 290 }
252 291
253 message AllowRedeemChromeOsRegistrationOffersProto { 292 message AllowRedeemChromeOsRegistrationOffersProto {
254 // Chrome OS Registration service provides way for chromeos device users 293 // Chrome OS Registration service provides way for chromeos device users
255 // to redeem electronic offers provided by service provider. 294 // to redeem electronic offers provided by service provider.
256 // This value determines if users are allowed to redeem offers through 295 // This value determines if users are allowed to redeem offers through
257 // Chrome OS Registration service. 296 // Chrome OS Registration service.
258 optional bool allow_redeem_offers = 1 [default = true]; 297 optional bool allow_redeem_offers = 1 [default = true];
259 } 298 }
260 299
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 optional StartUpUrlsProto start_up_urls = 18; 350 optional StartUpUrlsProto start_up_urls = 18;
312 optional PinnedAppsProto pinned_apps = 19; 351 optional PinnedAppsProto pinned_apps = 19;
313 optional SystemTimezoneProto system_timezone = 20; 352 optional SystemTimezoneProto system_timezone = 20;
314 optional DeviceLocalAccountsProto device_local_accounts = 21; 353 optional DeviceLocalAccountsProto device_local_accounts = 21;
315 optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22; 354 optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22;
316 optional StartUpFlagsProto start_up_flags = 23; 355 optional StartUpFlagsProto start_up_flags = 23;
317 optional UptimeLimitProto uptime_limit = 24; 356 optional UptimeLimitProto uptime_limit = 24;
318 optional VariationsParameterProto variations_parameter = 25; 357 optional VariationsParameterProto variations_parameter = 25;
319 optional AttestationSettingsProto attestation_settings = 26; 358 optional AttestationSettingsProto attestation_settings = 26;
320 } 359 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698