summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/resources/settings/site_settings_page/site_settings_page.js')
-rw-r--r--chromium/chrome/browser/resources/settings/site_settings_page/site_settings_page.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/chromium/chrome/browser/resources/settings/site_settings_page/site_settings_page.js b/chromium/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
index 25bee399e1c..588b6d078aa 100644
--- a/chromium/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
+++ b/chromium/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
@@ -60,10 +60,10 @@ Polymer({
},
/** @private */
- enableBluetoothScanningContentSetting_: {
+ enableInsecureContentContentSetting_: {
type: Boolean,
value: function() {
- return loadTimeData.getBoolean('enableBluetoothScanningContentSetting');
+ return loadTimeData.getBoolean('enableInsecureContentContentSetting');
}
},
@@ -130,7 +130,7 @@ Polymer({
pairs.push([R.SITE_SETTINGS_SERIAL_PORTS, 'serial-ports']);
}
- if (this.enableBluetoothScanningContentSetting_) {
+ if (this.enableExperimentalWebPlatformFeatures_) {
pairs.push([R.SITE_SETTINGS_BLUETOOTH_SCANNING, 'bluetooth-scanning']);
}
@@ -140,6 +140,10 @@ Polymer({
]);
}
+ if (this.enableInsecureContentContentSetting_) {
+ pairs.push([R.SITE_SETTINGS_MIXEDSCRIPT, 'mixed-script']);
+ }
+
pairs.forEach(([route, id]) => {
this.focusConfig.set(route.path, () => this.async(() => {
cr.ui.focusWithoutInk(assert(this.$$(`#${id}`)));