Commit 3cc2beeb authored by patricialor's avatar patricialor Committed by Commit Bot

MD Settings: Include settings for displaying Images in Site Details.

The "Images" content setting is missing from "Site Details". Add it.

chrome: //settings/content/siteDetails?site=http%3A%2F%2Fpermission.site%3A80
Review-Url: https://codereview.chromium.org/2915743002
Cr-Commit-Position: refs/heads/master@{#476493}
parent 93932dc8
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html"> <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html"> <link rel="import" href="chrome://resources/cr_elements/icons.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
<link rel="import" href="../icons.html">
<link rel="import" href="../route.html"> <link rel="import" href="../route.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
<link rel="import" href="constants.html"> <link rel="import" href="constants.html">
...@@ -90,6 +91,10 @@ ...@@ -90,6 +91,10 @@
icon="cr:extension" id="plugins" label="$i18n{siteSettingsFlash}" icon="cr:extension" id="plugins" label="$i18n{siteSettingsFlash}"
site="[[site]]"> site="[[site]]">
</site-details-permission> </site-details-permission>
<site-details-permission category="{{ContentSettingsTypes.IMAGES}}"
icon="settings:photo" id="images" label="$i18n{siteSettingsImages}"
site="[[site]]">
</site-details-permission>
<site-details-permission category="{{ContentSettingsTypes.POPUPS}}" <site-details-permission category="{{ContentSettingsTypes.POPUPS}}"
icon="cr:open-in-new" id="popups" label="$i18n{siteSettingsPopups}" icon="cr:open-in-new" id="popups" label="$i18n{siteSettingsPopups}"
site="[[site]]"> site="[[site]]">
......
...@@ -55,6 +55,14 @@ suite('SiteDetails', function() { ...@@ -55,6 +55,14 @@ suite('SiteDetails', function() {
source: 'preference', source: 'preference',
}, },
], ],
images: [
{
embeddingOrigin: 'https://foo-allow.com:443',
origin: 'https://foo-allow.com:443',
setting: 'allow',
source: 'preference',
},
],
javascript: [ javascript: [
{ {
embeddingOrigin: 'https://foo-allow.com:443', embeddingOrigin: 'https://foo-allow.com:443',
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* midiDevices: !Array<!RawSiteException>}, * midiDevices: !Array<!RawSiteException>},
* notifications: !Array<!RawSiteException>}, * notifications: !Array<!RawSiteException>},
* plugins: !Array<!RawSiteException>}, * plugins: !Array<!RawSiteException>},
* images: !Array<!RawSiteException>},
* popups: !Array<!RawSiteException>}, * popups: !Array<!RawSiteException>},
* unsandboxed_plugins: !Array<!RawSiteException>}, * unsandboxed_plugins: !Array<!RawSiteException>},
* }} * }}
...@@ -45,6 +46,7 @@ var prefsEmpty = { ...@@ -45,6 +46,7 @@ var prefsEmpty = {
midiDevices: '', midiDevices: '',
notifications: '', notifications: '',
plugins: '', plugins: '',
images: '',
popups: '', popups: '',
subresource_filter: '', subresource_filter: '',
unsandboxed_plugins: '', unsandboxed_plugins: '',
...@@ -60,6 +62,7 @@ var prefsEmpty = { ...@@ -60,6 +62,7 @@ var prefsEmpty = {
midiDevices: [], midiDevices: [],
notifications: [], notifications: [],
plugins: [], plugins: [],
images: [],
popups: [], popups: [],
subresource_filter: [], subresource_filter: [],
unsandboxed_plugins: [], unsandboxed_plugins: [],
......
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