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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/proto/chromeos/chrome_device_policy.proto
diff --git a/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto b/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto
index 06deb8ba8a89bf943deed8e5f3a9bf40d9033467..a88f58f525275ebd316277ec1518a702ff32af36 100644
--- a/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto
+++ b/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto
@@ -236,6 +236,12 @@ message SystemTimezoneProto {
optional string timezone = 1;
}
+message SystemUse24HourClockProto {
+ // Specifies an owner-determined clock format that applies to the login
+ // screen and all users.
+ optional bool use_24hour_clock = 1;
+}
+
// Parameters for Kiosk App device-local accounts.
message KioskAppInfoProto {
// Indicates the Kiosk App for the corresponding device-local account. The
@@ -539,4 +545,5 @@ message ChromeDeviceSettingsProto {
optional AccessibilitySettingsProto accessibility_settings = 27;
optional SupervisedUsersSettingsProto supervised_users_settings = 28;
optional LoginScreenPowerManagementProto login_screen_power_management = 29;
+ optional SystemUse24HourClockProto use_24hour_clock = 30;
}
« 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