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

Unified 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, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 61bac677093f3eb5461cabb4c1145204582ffd00..0364e0f44811ee4404abae26b2950d94b631211d 100644
--- a/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto
+++ b/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto
@@ -64,9 +64,8 @@ message DeviceProxySettingsProto {
optional string proxy_bypass_list = 4;
}
-// This was added to the protobuf definition but never implemented. Chrome can
-// meanwhile lock down access to media devices via a user policy, so the
-// device-level setting is deprecated for good.
+// This is used by chromeos, make sure to do cleanup there before marking it as
+// obsolette.
message CameraEnabledProto {
optional bool camera_enabled = 1;
}
@@ -545,7 +544,7 @@ message ChromeDeviceSettingsProto {
optional UserWhitelistProto user_whitelist = 2;
optional GuestModeEnabledProto guest_mode_enabled = 3;
optional DeviceProxySettingsProto device_proxy_settings = 4;
- optional CameraEnabledProto OBSOLETE_camera_enabled = 5 [deprecated = true];
+ optional CameraEnabledProto camera_enabled = 5;
optional ShowUserNamesOnSigninProto show_user_names = 6;
optional DataRoamingEnabledProto data_roaming_enabled = 7;
optional AllowNewUsersProto allow_new_users = 8;
« 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