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

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

Issue 23460030: Clean up device policy definitions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 3 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 57 }
58 58
59 message DeviceProxySettingsProto { 59 message DeviceProxySettingsProto {
60 // One of "direct", "auto_detect", "pac_script", "fixed_servers", "system" 60 // One of "direct", "auto_detect", "pac_script", "fixed_servers", "system"
61 optional string proxy_mode = 1; 61 optional string proxy_mode = 1;
62 optional string proxy_server = 2; 62 optional string proxy_server = 2;
63 optional string proxy_pac_url = 3; 63 optional string proxy_pac_url = 3;
64 optional string proxy_bypass_list = 4; 64 optional string proxy_bypass_list = 4;
65 } 65 }
66 66
67 // This was added to the protobuf definition but never implemented. Chrome can
68 // meanwhile lock down access to media devices via a user policy, so the
69 // device-level setting is deprecated for good.
67 message CameraEnabledProto { 70 message CameraEnabledProto {
68 optional bool camera_enabled = 1; 71 optional bool camera_enabled = 1;
69 } 72 }
70 73
71 message MetricsEnabledProto { 74 message MetricsEnabledProto {
72 optional bool metrics_enabled = 1; 75 optional bool metrics_enabled = 1;
73 } 76 }
74 77
75 message ReleaseChannelProto { 78 message ReleaseChannelProto {
76 // One of "stable-channel", "beta-channel", or "dev-channel" 79 // One of "stable-channel", "beta-channel", or "dev-channel"
(...skipping 23 matching lines...) Expand all
100 // Determines whether users should be treated as ephemeral. In ephemeral users 103 // Determines whether users should be treated as ephemeral. In ephemeral users
101 // mode, no cryptohome is created for the user, but a tmpfs mount is used 104 // mode, no cryptohome is created for the user, but a tmpfs mount is used
102 // instead such that upon logout all user state is discarded. 105 // instead such that upon logout all user state is discarded.
103 optional bool ephemeral_users_enabled = 1; 106 optional bool ephemeral_users_enabled = 1;
104 } 107 }
105 108
106 // Details of an extension to install as part of the AppPack. 109 // Details of an extension to install as part of the AppPack.
107 message AppPackEntryProto { 110 message AppPackEntryProto {
108 optional string extension_id = 1; 111 optional string extension_id = 1;
109 optional string update_url = 2; 112 optional string update_url = 2;
110 optional bool online_only = 3; 113
114 // This field was added but never used and there are no plans to support it
115 // eventually either.
116 optional bool OBSOLETE_online_only = 3 [deprecated = true];
111 } 117 }
112 118
113 message AppPackProto { 119 message AppPackProto {
114 // List of extensions to install as part of the AppPack. 120 // List of extensions to install as part of the AppPack.
115 repeated AppPackEntryProto app_pack = 1; 121 repeated AppPackEntryProto app_pack = 1;
116 } 122 }
117 123
118 // This is a special policy for kiosk/retail mode that specifies what apps 124 // This is a special policy for kiosk/retail mode that specifies what apps
119 // should be pinned to the launcher. For regular accounts, pinned apps are 125 // should be pinned to the launcher. For regular accounts, pinned apps are
120 // controlled through user policy. 126 // controlled through user policy.
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 optional bool use_24hour_clock = 1; 256 optional bool use_24hour_clock = 1;
251 } 257 }
252 258
253 // Parameters for Kiosk App device-local accounts. 259 // Parameters for Kiosk App device-local accounts.
254 message KioskAppInfoProto { 260 message KioskAppInfoProto {
255 // Indicates the Kiosk App for the corresponding device-local account. The 261 // Indicates the Kiosk App for the corresponding device-local account. The
256 // string value should be a valid 32-character Chrome App identifier and 262 // string value should be a valid 32-character Chrome App identifier and
257 // specifies the Kiosk App to download and run. 263 // specifies the Kiosk App to download and run.
258 optional string app_id = 1; 264 optional string app_id = 1;
259 265
260 // Optional extension update URL to download the Kiosk App package from. If 266 // Obsolete: Kiosk Apps can only be installed from the Chrome Web Store.
261 // not specified, the app will be downloaded from the standard Chrome Web 267 optional string OBSOLETE_update_url = 2 [deprecated = true];
262 // Store update URL.
263 optional string update_url = 2;
264 } 268 }
265 269
266 // Describes a single device-local account. 270 // Describes a single device-local account.
267 message DeviceLocalAccountInfoProto { 271 message DeviceLocalAccountInfoProto {
268 // Deprecated: Account identifier for a public session device-local account. 272 // Deprecated: Account identifier for a public session device-local account.
269 // Old code didn't have the |type| field, so it can't handle new types of 273 // Old code didn't have the |type| field, so it can't handle new types of
270 // device-local accounts gracefully (i.e. ignoring unsupported types). New 274 // device-local accounts gracefully (i.e. ignoring unsupported types). New
271 // code should instead set type to ACCOUNT_TYPE_PUBLIC_SESSION and write the 275 // code should instead set type to ACCOUNT_TYPE_PUBLIC_SESSION and write the
272 // identifier to the |account_id| field below. If the |type| field is present, 276 // identifier to the |account_id| field below. If the |type| field is present,
273 // |deprecated_public_session_id| will be ignored. 277 // |deprecated_public_session_id| will be ignored.
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 // } 532 // }
529 // } 533 // }
530 optional string login_screen_power_management = 1; 534 optional string login_screen_power_management = 1;
531 } 535 }
532 536
533 message ChromeDeviceSettingsProto { 537 message ChromeDeviceSettingsProto {
534 optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1; 538 optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1;
535 optional UserWhitelistProto user_whitelist = 2; 539 optional UserWhitelistProto user_whitelist = 2;
536 optional GuestModeEnabledProto guest_mode_enabled = 3; 540 optional GuestModeEnabledProto guest_mode_enabled = 3;
537 optional DeviceProxySettingsProto device_proxy_settings = 4; 541 optional DeviceProxySettingsProto device_proxy_settings = 4;
538 optional CameraEnabledProto camera_enabled = 5; 542 optional CameraEnabledProto OBSOLETE_camera_enabled = 5 [deprecated = true];
539 optional ShowUserNamesOnSigninProto show_user_names = 6; 543 optional ShowUserNamesOnSigninProto show_user_names = 6;
540 optional DataRoamingEnabledProto data_roaming_enabled = 7; 544 optional DataRoamingEnabledProto data_roaming_enabled = 7;
541 optional AllowNewUsersProto allow_new_users = 8; 545 optional AllowNewUsersProto allow_new_users = 8;
542 optional MetricsEnabledProto metrics_enabled = 9; 546 optional MetricsEnabledProto metrics_enabled = 9;
543 optional ReleaseChannelProto release_channel = 10; 547 optional ReleaseChannelProto release_channel = 10;
544 optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11; 548 optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11;
545 optional DeviceReportingProto device_reporting = 12; 549 optional DeviceReportingProto device_reporting = 12;
546 optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13; 550 optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13;
547 optional AppPackProto app_pack = 14; 551 optional AppPackProto app_pack = 14;
548 optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15; 552 optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15;
549 optional ScreenSaverProto login_screen_saver = 16; 553 optional ScreenSaverProto login_screen_saver = 16;
550 optional AutoUpdateSettingsProto auto_update_settings = 17; 554 optional AutoUpdateSettingsProto auto_update_settings = 17;
551 optional StartUpUrlsProto start_up_urls = 18; 555 optional StartUpUrlsProto start_up_urls = 18;
552 optional PinnedAppsProto pinned_apps = 19; 556 optional PinnedAppsProto pinned_apps = 19;
553 optional SystemTimezoneProto system_timezone = 20; 557 optional SystemTimezoneProto system_timezone = 20;
554 optional DeviceLocalAccountsProto device_local_accounts = 21; 558 optional DeviceLocalAccountsProto device_local_accounts = 21;
555 optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22; 559 optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22;
556 optional StartUpFlagsProto start_up_flags = 23; 560 optional StartUpFlagsProto start_up_flags = 23;
557 optional UptimeLimitProto uptime_limit = 24; 561 optional UptimeLimitProto uptime_limit = 24;
558 optional VariationsParameterProto variations_parameter = 25; 562 optional VariationsParameterProto variations_parameter = 25;
559 optional AttestationSettingsProto attestation_settings = 26; 563 optional AttestationSettingsProto attestation_settings = 26;
560 optional AccessibilitySettingsProto accessibility_settings = 27; 564 optional AccessibilitySettingsProto accessibility_settings = 27;
561 optional SupervisedUsersSettingsProto supervised_users_settings = 28; 565 optional SupervisedUsersSettingsProto supervised_users_settings = 28;
562 optional LoginScreenPowerManagementProto login_screen_power_management = 29; 566 optional LoginScreenPowerManagementProto login_screen_power_management = 29;
563 optional SystemUse24HourClockProto use_24hour_clock = 30; 567 optional SystemUse24HourClockProto use_24hour_clock = 30;
564 } 568 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_provider.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