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

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

Issue 1849133006: Revert "ChromeOS: Add SystemTimezoneAutomaticDetection policy." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 // all users. Valid values are listed in "timezone_settings.cc". Additionally, 242 // all users. Valid values are listed in "timezone_settings.cc". Additionally,
243 // timezones from the "IANA Time Zone Database" (e.g. listed on wikipedia) 243 // timezones from the "IANA Time Zone Database" (e.g. listed on wikipedia)
244 // that are equivalent to one of the timezones in "timezone_settings.cc" are 244 // that are equivalent to one of the timezones in "timezone_settings.cc" are
245 // valid. In case of an invalid value, the setting is still activated with a 245 // valid. In case of an invalid value, the setting is still activated with a
246 // fallback timezone (currently "GMT"). In case of an empty string or if no 246 // fallback timezone (currently "GMT"). In case of an empty string or if no
247 // value is provided, the timezone device setting is inactive. In that case, 247 // value is provided, the timezone device setting is inactive. In that case,
248 // the currently active timezone will remain in use however users can change 248 // the currently active timezone will remain in use however users can change
249 // the timezone and the change is persistent. Thus a change by one user 249 // the timezone and the change is persistent. Thus a change by one user
250 // affects the login-screen and all other users. 250 // affects the login-screen and all other users.
251 optional string timezone = 1; 251 optional string timezone = 1;
252
253 // This allows domain administrators to control the timezone settings for
254 // their devices.
255 enum AutomaticTimezoneDetectionType {
256 USERS_DECIDE = 0;
257 DISABLED = 1;
258 IP_ONLY = 2;
259 SEND_WIFI_ACCESS_POINTS = 3;
260 SEND_WIFI_ACCESS_POINTS_TEST = 4;
261 };
262
263 optional AutomaticTimezoneDetectionType timezone_detection_type = 2;
264 } 252 }
265 253
266 message SystemUse24HourClockProto { 254 message SystemUse24HourClockProto {
267 // Specifies an owner-determined clock format that applies to the login 255 // Specifies an owner-determined clock format that applies to the login
268 // screen and is used as a default for all user sessions. Users can still 256 // screen and is used as a default for all user sessions. Users can still
269 // override the format to use for their account. 257 // override the format to use for their account.
270 // 258 //
271 // True and false select a 24 and 12 hour clock format, respectively. The 259 // True and false select a 24 and 12 hour clock format, respectively. The
272 // default format for the case the setting is not present is 24 hour clock. 260 // default format for the case the setting is not present is 24 hour clock.
273 optional bool use_24hour_clock = 1; 261 optional bool use_24hour_clock = 1;
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 optional LoginScreenDomainAutoCompleteProto 730 optional LoginScreenDomainAutoCompleteProto
743 login_screen_domain_auto_complete = 37; 731 login_screen_domain_auto_complete = 37;
744 optional DeviceLogUploadSettingsProto device_log_upload_settings = 38; 732 optional DeviceLogUploadSettingsProto device_log_upload_settings = 38;
745 optional DisplayRotationDefaultProto display_rotation_default = 39; 733 optional DisplayRotationDefaultProto display_rotation_default = 39;
746 optional AllowKioskAppControlChromeVersionProto 734 optional AllowKioskAppControlChromeVersionProto
747 allow_kiosk_app_control_chrome_version = 40; 735 allow_kiosk_app_control_chrome_version = 40;
748 optional LoginAuthenticationBehaviorProto login_authentication_behavior = 41; 736 optional LoginAuthenticationBehaviorProto login_authentication_behavior = 41;
749 optional UsbDetachableWhitelistProto usb_detachable_whitelist = 42; 737 optional UsbDetachableWhitelistProto usb_detachable_whitelist = 42;
750 optional AllowBluetoothProto allow_bluetooth = 43; 738 optional AllowBluetoothProto allow_bluetooth = 43;
751 } 739 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698