summaryrefslogtreecommitdiff
path: root/chromium/chrome/common/extensions/permissions
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/common/extensions/permissions')
-rw-r--r--chromium/chrome/common/extensions/permissions/chrome_api_permissions.cc3
-rw-r--r--chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc9
-rw-r--r--chromium/chrome/common/extensions/permissions/permission_set_unittest.cc5
3 files changed, 12 insertions, 5 deletions
diff --git a/chromium/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chromium/chrome/common/extensions/permissions/chrome_api_permissions.cc
index c6a72f2ce8e..ec06f67d656 100644
--- a/chromium/chrome/common/extensions/permissions/chrome_api_permissions.cc
+++ b/chromium/chrome/common/extensions/permissions/chrome_api_permissions.cc
@@ -77,6 +77,9 @@ constexpr APIPermissionInfo::InitInfo permissions_to_register[] = {
APIPermissionInfo::kFlagDoesNotRequireManagedSessionFullLoginWarning},
{APIPermission::kEnterpriseHardwarePlatform, "enterprise.hardwarePlatform",
APIPermissionInfo::kFlagDoesNotRequireManagedSessionFullLoginWarning},
+ {APIPermission::kEnterpriseNetworkingAttributes,
+ "enterprise.networkingAttributes",
+ APIPermissionInfo::kFlagDoesNotRequireManagedSessionFullLoginWarning},
{APIPermission::kEnterprisePlatformKeys, "enterprise.platformKeys",
APIPermissionInfo::kFlagDoesNotRequireManagedSessionFullLoginWarning},
{APIPermission::kFileBrowserHandler, "fileBrowserHandler",
diff --git a/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc b/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
index 26bf88f800f..8385bc2f259 100644
--- a/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
+++ b/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
@@ -670,6 +670,15 @@ ChromePermissionMessageRule::GetAllRules() {
{IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_HARDWARE_PLATFORM,
{APIPermission::kEnterpriseHardwarePlatform},
{}},
+ {IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_DEVICE_ATTRIBUTES,
+ {APIPermission::kEnterpriseDeviceAttributes},
+ {}},
+ {IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_NETWORKING_ATTRIBUTES,
+ {APIPermission::kEnterpriseNetworkingAttributes},
+ {}},
+ {IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_PLATFORMKEYS,
+ {APIPermission::kEnterprisePlatformKeys},
+ {}},
{IDS_EXTENSION_PROMPT_WARNING_LOGIN, {APIPermission::kLogin}, {}},
{IDS_EXTENSION_PROMPT_WARNING_LOGIN_SCREEN_UI,
{APIPermission::kLoginScreenUi},
diff --git a/chromium/chrome/common/extensions/permissions/permission_set_unittest.cc b/chromium/chrome/common/extensions/permissions/permission_set_unittest.cc
index 55ff95f2e81..1284ab87161 100644
--- a/chromium/chrome/common/extensions/permissions/permission_set_unittest.cc
+++ b/chromium/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -781,11 +781,6 @@ TEST(PermissionsTest, PermissionMessages) {
skip.insert(APIPermission::kWebView);
skip.insert(APIPermission::kWindowShape);
- // These permissions are restricted to extensions force-installed by policy
- // and don't require a prompt, i.e. they're restricted to location 'policy'.
- skip.insert(APIPermission::kEnterprisePlatformKeys);
- skip.insert(APIPermission::kEnterpriseDeviceAttributes);
-
// TODO(erikkay) add a string for this permission.
skip.insert(APIPermission::kBackground);