Commit 68c67102 authored by sauski's avatar sauski Committed by Commit Bot

WebUI Settings: Remove unused site-details-permission id attributes

Bug: 1081866
Change-Id: I8d472c78e4251c3549b24ee4eda01a20f97df75a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2404925Reviewed-by: default avatarRainhard Findling <rainhard@chromium.org>
Commit-Queue: Theodore Olsauskas-Warren <sauski@google.com>
Cr-Commit-Position: refs/heads/master@{#807391}
parent 88a44f8e
......@@ -123,149 +123,123 @@
</div>
<div class="list-frame">
<site-details-permission category="[[ContentSettingsTypes.GEOLOCATION]]"
icon="cr:location-on" id="geolocation"
label="$i18n{siteSettingsLocation}">
icon="cr:location-on" label="$i18n{siteSettingsLocation}">
</site-details-permission>
<site-details-permission category="[[ContentSettingsTypes.CAMERA]]"
icon="cr:videocam" id="camera"
label="$i18n{siteSettingsCamera}">
icon="cr:videocam" label="$i18n{siteSettingsCamera}">
</site-details-permission>
<site-details-permission category="[[ContentSettingsTypes.MIC]]"
icon="cr:mic" id="mic"
label="$i18n{siteSettingsMic}">
icon="cr:mic" label="$i18n{siteSettingsMic}">
</site-details-permission>
<site-details-permission
category="[[ContentSettingsTypes.SENSORS]]"
icon="settings:sensors" id="sensors"
label="$i18n{siteSettingsSensors}">
<site-details-permission category="[[ContentSettingsTypes.SENSORS]]"
icon="settings:sensors" label="$i18n{siteSettingsSensors}">
</site-details-permission>
<site-details-permission category="[[ContentSettingsTypes.NOTIFICATIONS]]"
icon="settings:notifications" id="notifications"
icon="settings:notifications"
label="$i18n{siteSettingsNotifications}">
</site-details-permission>
<site-details-permission category="[[ContentSettingsTypes.JAVASCRIPT]]"
icon="settings:code" id="javascript"
label="$i18n{siteSettingsJavascript}">
icon="settings:code" label="$i18n{siteSettingsJavascript}">
</site-details-permission>
<site-details-permission category="[[ContentSettingsTypes.PLUGINS]]"
icon="cr:extension" id="plugins" label="$i18n{siteSettingsFlash}">
icon="cr:extension" label="$i18n{siteSettingsFlash}">
</site-details-permission>
<site-details-permission category="[[ContentSettingsTypes.IMAGES]]"
icon="settings:photo" id="images" label="$i18n{siteSettingsImages}">
icon="settings:photo" label="$i18n{siteSettingsImages}">
</site-details-permission>
<site-details-permission category="[[ContentSettingsTypes.POPUPS]]"
icon="cr:open-in-new" id="popups" label="$i18n{siteSettingsPopups}">
icon="cr:open-in-new" label="$i18n{siteSettingsPopups}">
</site-details-permission>
<site-details-permission
category="[[ContentSettingsTypes.ADS]]"
icon="settings:ads" id="ads"
label="$i18n{siteSettingsAds}">
<site-details-permission category="[[ContentSettingsTypes.ADS]]"
icon="settings:ads" label="$i18n{siteSettingsAds}">
</site-details-permission>
<site-details-permission
category="[[ContentSettingsTypes.BACKGROUND_SYNC]]"
icon="cr:sync" id="backgroundSync"
label="$i18n{siteSettingsBackgroundSync}">
icon="cr:sync" label="$i18n{siteSettingsBackgroundSync}">
</site-details-permission>
<site-details-permission category="[[ContentSettingsTypes.SOUND]]"
icon="settings:volume-up" id="sound"
label="$i18n{siteSettingsSound}"
icon="settings:volume-up" label="$i18n{siteSettingsSound}"
use-automatic-label="[[blockAutoplayEnabled]]">
</site-details-permission>
<site-details-permission
category="[[ContentSettingsTypes.AUTOMATIC_DOWNLOADS]]"
icon="cr:file-download" id="automaticDownloads"
label="$i18n{siteSettingsAutomaticDownloads}">
icon="cr:file-download" label="$i18n{siteSettingsAutomaticDownloads}">
</site-details-permission>
<site-details-permission
category="[[ContentSettingsTypes.MIDI_DEVICES]]" icon="settings:midi"
id="midiDevices" label="$i18n{siteSettingsMidiDevices}">
<site-details-permission category="[[ContentSettingsTypes.MIDI_DEVICES]]"
icon="settings:midi" label="$i18n{siteSettingsMidiDevices}">
</site-details-permission>
<site-details-permission
category="[[ContentSettingsTypes.USB_DEVICES]]" icon="settings:usb"
id="usbDevices" label="$i18n{siteSettingsUsbDevices}">
<site-details-permission category="[[ContentSettingsTypes.USB_DEVICES]]"
icon="settings:usb" label="$i18n{siteSettingsUsbDevices}">
</site-details-permission>
<site-details-permission
category="[[ContentSettingsTypes.SERIAL_PORTS]]"
icon="settings:serial-port" id="serialPorts"
label="$i18n{siteSettingsSerialPorts}">
<site-details-permission category="[[ContentSettingsTypes.SERIAL_PORTS]]"
icon="settings:serial-port" label="$i18n{siteSettingsSerialPorts}">
</site-details-permission>
<template is="dom-if" if="[[enableWebBluetoothNewPermissionsBackend_]]">
<site-details-permission
category="[[ContentSettingsTypes.BLUETOOTH_DEVICES]]"
icon="settings:bluetooth" id="bluetoothDevices"
icon="settings:bluetooth"
label="$i18n{siteSettingsBluetoothDevices}">
</site-details-permission>
</template>
<template is="dom-if" if="[[enableFileSystemWriteContentSetting_]]">
<site-details-permission
category="[[ContentSettingsTypes.FILE_SYSTEM_WRITE]]"
icon="settings:save-original" id="fileSystemWrite"
icon="settings:save-original"
label="$i18n{siteSettingsFileSystemWrite}">
</site-details-permission>
</template>
<site-details-permission
category="[[ContentSettingsTypes.HID_DEVICES]]"
icon="settings:hid-device" id="hidDevices"
label="$i18n{siteSettingsHidDevices}">
<site-details-permission category="[[ContentSettingsTypes.HID_DEVICES]]"
icon="settings:hid-device" label="$i18n{siteSettingsHidDevices}">
</site-details-permission>
<site-details-permission
category="[[ContentSettingsTypes.UNSANDBOXED_PLUGINS]]"
icon="cr:extension" id="unsandboxedPlugins"
label="$i18n{siteSettingsUnsandboxedPlugins}">
icon="cr:extension" label="$i18n{siteSettingsUnsandboxedPlugins}">
</site-details-permission>
<if expr="chromeos">
<site-details-permission
category="[[ContentSettingsTypes.PROTECTED_CONTENT]]"
icon="settings:protected-content" id="protectedContent"
icon="settings:protected-content"
label="$i18n{siteSettingsProtectedContentIdentifiers}">
</site-details-permission>
</if>
<site-details-permission
category="[[ContentSettingsTypes.CLIPBOARD]]"
icon="settings:clipboard" id="clipboard"
label="$i18n{siteSettingsClipboard}">
<site-details-permission category="[[ContentSettingsTypes.CLIPBOARD]]"
icon="settings:clipboard" label="$i18n{siteSettingsClipboard}">
</site-details-permission>
<site-details-permission
category="[[ContentSettingsTypes.PAYMENT_HANDLER]]"
icon="settings:payment-handler" id="paymentHandler"
icon="settings:payment-handler"
label="$i18n{siteSettingsPaymentHandler}">
</site-details-permission>
<template is="dom-if" if="[[enableExperimentalWebPlatformFeatures_]]">
<site-details-permission
category="[[ContentSettingsTypes.BLUETOOTH_SCANNING]]"
icon="settings:bluetooth-scanning" id="bluetoothScanning"
icon="settings:bluetooth-scanning"
label="$i18n{siteSettingsBluetoothScanning}">
</site-details-permission>
</template>
<template is="dom-if" if="[[enableInsecureContentContentSetting_]]">
<site-details-permission
category="[[ContentSettingsTypes.MIXEDSCRIPT]]"
icon="settings:insecure-content" id="mixed-script"
icon="settings:insecure-content"
label="$i18n{siteSettingsInsecureContent}">
</site-details-permission>
</template>
<site-details-permission
category="[[ContentSettingsTypes.AR]]"
icon="settings:vr-headset" id="ar"
label="$i18n{siteSettingsAr}">
<site-details-permission category="[[ContentSettingsTypes.AR]]"
icon="settings:vr-headset" label="$i18n{siteSettingsAr}">
</site-details-permission>
<site-details-permission
category="[[ContentSettingsTypes.VR]]"
icon="settings:vr-headset" id="vr"
label="$i18n{siteSettingsVr}">
<site-details-permission category="[[ContentSettingsTypes.VR]]"
icon="settings:vr-headset" label="$i18n{siteSettingsVr}">
</site-details-permission>
<template is="dom-if" if="[[enableExperimentalWebPlatformFeatures_]]">
<site-details-permission
category="[[ContentSettingsTypes.WINDOW_PLACEMENT]]"
icon="settings:window-placement" id="windowPlacement"
icon="settings:window-placement"
label="$i18n{siteSettingsWindowPlacement}">
</site-details-permission>
</template>
<template is="dom-if" if="[[enableFontAccessContentSetting_]]">
<site-details-permission
category="[[ContentSettingsTypes.FONT_ACCESS]]"
icon="settings:font-access" id="fontAccess"
label="$i18n{fonts}">
<site-details-permission category="[[ContentSettingsTypes.FONT_ACCESS]]"
icon="settings:font-access" label="$i18n{fonts}">
</site-details-permission>
</template>
</div>
......@@ -476,8 +476,9 @@ suite('SiteDetails', function() {
browserProxy.setPrefs(prefs);
testElement = createSiteDetails('https://foo.com:443');
const siteDetailsPermission =
testElement.root.querySelector('#notifications');
const elems = testElement.root.querySelectorAll('site-details-permission');
const notificationPermission = Array.from(elems).find(
elem => elem.category === ContentSettingsTypes.NOTIFICATIONS);
// Wait for all the permissions to be populated initially.
return browserProxy.whenCalled('isOriginValid')
......@@ -486,11 +487,11 @@ suite('SiteDetails', function() {
})
.then(() => {
// Make sure initial state is as expected.
assertEquals(ContentSetting.ASK, siteDetailsPermission.site.setting);
assertEquals(ContentSetting.ASK, notificationPermission.site.setting);
assertEquals(
SiteSettingSource.POLICY, siteDetailsPermission.site.source);
SiteSettingSource.POLICY, notificationPermission.site.source);
assertEquals(
ContentSetting.ASK, siteDetailsPermission.$.permission.value);
ContentSetting.ASK, notificationPermission.$.permission.value);
// Set new prefs and make sure only that permission is updated.
const newException = {
......@@ -509,13 +510,14 @@ suite('SiteDetails', function() {
// getOriginPermissions was to check notifications.
assertTrue(args[1].includes(ContentSettingsTypes.NOTIFICATIONS));
// Check |siteDetailsPermission| now shows the new permission value.
// Check |notificationPermission| now shows the new permission value.
assertEquals(
ContentSetting.BLOCK, siteDetailsPermission.site.setting);
ContentSetting.BLOCK, notificationPermission.site.setting);
assertEquals(
SiteSettingSource.DEFAULT, siteDetailsPermission.site.source);
SiteSettingSource.DEFAULT, notificationPermission.site.source);
assertEquals(
ContentSetting.DEFAULT, siteDetailsPermission.$.permission.value);
ContentSetting.DEFAULT,
notificationPermission.$.permission.value);
});
});
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment