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

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

Issue 21133012: Login screen and Guest mode should use device owner preference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflict. Created 7 years, 4 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
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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 // that are equivalent to one of the timezones in "timezone_settings.cc" are 229 // that are equivalent to one of the timezones in "timezone_settings.cc" are
230 // valid. In case of an invalid value, the setting is still activated with a 230 // valid. In case of an invalid value, the setting is still activated with a
231 // fallback timezone (currently "GMT"). In case of an empty string or if no 231 // fallback timezone (currently "GMT"). In case of an empty string or if no
232 // value is provided, the timezone device setting is inactive. In that case, 232 // value is provided, the timezone device setting is inactive. In that case,
233 // the currently active timezone will remain in use however users can change 233 // the currently active timezone will remain in use however users can change
234 // the timezone and the change is persistent. Thus a change by one user 234 // the timezone and the change is persistent. Thus a change by one user
235 // affects the login-screen and all other users. 235 // affects the login-screen and all other users.
236 optional string timezone = 1; 236 optional string timezone = 1;
237 } 237 }
238 238
239 message SystemUse24HourClockProto {
240 // Specifies an owner-determined clock format that applies to the login
241 // screen and all users.
242 optional bool use_24hour_clock = 1;
243 }
244
239 // Parameters for Kiosk App device-local accounts. 245 // Parameters for Kiosk App device-local accounts.
240 message KioskAppInfoProto { 246 message KioskAppInfoProto {
241 // Indicates the Kiosk App for the corresponding device-local account. The 247 // Indicates the Kiosk App for the corresponding device-local account. The
242 // string value should be a valid 32-character Chrome App identifier and 248 // string value should be a valid 32-character Chrome App identifier and
243 // specifies the Kiosk App to download and run. 249 // specifies the Kiosk App to download and run.
244 optional string app_id = 1; 250 optional string app_id = 1;
245 251
246 // Optional extension update URL to download the Kiosk App package from. If 252 // Optional extension update URL to download the Kiosk App package from. If
247 // not specified, the app will be downloaded from the standard Chrome Web 253 // not specified, the app will be downloaded from the standard Chrome Web
248 // Store update URL. 254 // Store update URL.
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 optional SystemTimezoneProto system_timezone = 20; 538 optional SystemTimezoneProto system_timezone = 20;
533 optional DeviceLocalAccountsProto device_local_accounts = 21; 539 optional DeviceLocalAccountsProto device_local_accounts = 21;
534 optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22; 540 optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22;
535 optional StartUpFlagsProto start_up_flags = 23; 541 optional StartUpFlagsProto start_up_flags = 23;
536 optional UptimeLimitProto uptime_limit = 24; 542 optional UptimeLimitProto uptime_limit = 24;
537 optional VariationsParameterProto variations_parameter = 25; 543 optional VariationsParameterProto variations_parameter = 25;
538 optional AttestationSettingsProto attestation_settings = 26; 544 optional AttestationSettingsProto attestation_settings = 26;
539 optional AccessibilitySettingsProto accessibility_settings = 27; 545 optional AccessibilitySettingsProto accessibility_settings = 27;
540 optional SupervisedUsersSettingsProto supervised_users_settings = 28; 546 optional SupervisedUsersSettingsProto supervised_users_settings = 28;
541 optional LoginScreenPowerManagementProto login_screen_power_management = 29; 547 optional LoginScreenPowerManagementProto login_screen_power_management = 29;
548 optional SystemUse24HourClockProto use_24hour_clock = 30;
542 } 549 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698