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

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

Issue 39803003: Do not mark CameraEnabled proto before it is removed from ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 67 // This is used by chromeos, make sure to do cleanup there before marking it as
68 // meanwhile lock down access to media devices via a user policy, so the 68 // obsolette.
69 // device-level setting is deprecated for good.
70 message CameraEnabledProto { 69 message CameraEnabledProto {
71 optional bool camera_enabled = 1; 70 optional bool camera_enabled = 1;
72 } 71 }
73 72
74 message MetricsEnabledProto { 73 message MetricsEnabledProto {
75 optional bool metrics_enabled = 1; 74 optional bool metrics_enabled = 1;
76 } 75 }
77 76
78 message ReleaseChannelProto { 77 message ReleaseChannelProto {
79 // One of "stable-channel", "beta-channel", or "dev-channel" 78 // One of "stable-channel", "beta-channel", or "dev-channel"
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 // Configures strategy for automatic clean-up process that is run when device 537 // Configures strategy for automatic clean-up process that is run when device
539 // runs out of free disk space. One of "remove-lru", "remove-lru-if-dormant". 538 // runs out of free disk space. One of "remove-lru", "remove-lru-if-dormant".
540 optional string clean_up_strategy = 1; 539 optional string clean_up_strategy = 1;
541 } 540 }
542 541
543 message ChromeDeviceSettingsProto { 542 message ChromeDeviceSettingsProto {
544 optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1; 543 optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1;
545 optional UserWhitelistProto user_whitelist = 2; 544 optional UserWhitelistProto user_whitelist = 2;
546 optional GuestModeEnabledProto guest_mode_enabled = 3; 545 optional GuestModeEnabledProto guest_mode_enabled = 3;
547 optional DeviceProxySettingsProto device_proxy_settings = 4; 546 optional DeviceProxySettingsProto device_proxy_settings = 4;
548 optional CameraEnabledProto OBSOLETE_camera_enabled = 5 [deprecated = true]; 547 optional CameraEnabledProto camera_enabled = 5;
549 optional ShowUserNamesOnSigninProto show_user_names = 6; 548 optional ShowUserNamesOnSigninProto show_user_names = 6;
550 optional DataRoamingEnabledProto data_roaming_enabled = 7; 549 optional DataRoamingEnabledProto data_roaming_enabled = 7;
551 optional AllowNewUsersProto allow_new_users = 8; 550 optional AllowNewUsersProto allow_new_users = 8;
552 optional MetricsEnabledProto metrics_enabled = 9; 551 optional MetricsEnabledProto metrics_enabled = 9;
553 optional ReleaseChannelProto release_channel = 10; 552 optional ReleaseChannelProto release_channel = 10;
554 optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11; 553 optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11;
555 optional DeviceReportingProto device_reporting = 12; 554 optional DeviceReportingProto device_reporting = 12;
556 optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13; 555 optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13;
557 optional AppPackProto app_pack = 14; 556 optional AppPackProto app_pack = 14;
558 optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15; 557 optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15;
559 optional ScreenSaverProto login_screen_saver = 16; 558 optional ScreenSaverProto login_screen_saver = 16;
560 optional AutoUpdateSettingsProto auto_update_settings = 17; 559 optional AutoUpdateSettingsProto auto_update_settings = 17;
561 optional StartUpUrlsProto start_up_urls = 18; 560 optional StartUpUrlsProto start_up_urls = 18;
562 optional PinnedAppsProto pinned_apps = 19; 561 optional PinnedAppsProto pinned_apps = 19;
563 optional SystemTimezoneProto system_timezone = 20; 562 optional SystemTimezoneProto system_timezone = 20;
564 optional DeviceLocalAccountsProto device_local_accounts = 21; 563 optional DeviceLocalAccountsProto device_local_accounts = 21;
565 optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22; 564 optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22;
566 optional StartUpFlagsProto start_up_flags = 23; 565 optional StartUpFlagsProto start_up_flags = 23;
567 optional UptimeLimitProto uptime_limit = 24; 566 optional UptimeLimitProto uptime_limit = 24;
568 optional VariationsParameterProto variations_parameter = 25; 567 optional VariationsParameterProto variations_parameter = 25;
569 optional AttestationSettingsProto attestation_settings = 26; 568 optional AttestationSettingsProto attestation_settings = 26;
570 optional AccessibilitySettingsProto accessibility_settings = 27; 569 optional AccessibilitySettingsProto accessibility_settings = 27;
571 optional SupervisedUsersSettingsProto supervised_users_settings = 28; 570 optional SupervisedUsersSettingsProto supervised_users_settings = 28;
572 optional LoginScreenPowerManagementProto login_screen_power_management = 29; 571 optional LoginScreenPowerManagementProto login_screen_power_management = 29;
573 optional SystemUse24HourClockProto use_24hour_clock = 30; 572 optional SystemUse24HourClockProto use_24hour_clock = 30;
574 optional AutoCleanupSettigsProto auto_clean_up_settings = 31; 573 optional AutoCleanupSettigsProto auto_clean_up_settings = 31;
575 } 574 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698