summaryrefslogtreecommitdiff
path: root/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.html
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/resources/settings/site_settings/site_details_permission.html')
-rw-r--r--chromium/chrome/browser/resources/settings/site_settings/site_details_permission.html13
1 files changed, 8 insertions, 5 deletions
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.html b/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.html
index b356f183552..c55f5716acf 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.html
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.html
@@ -1,6 +1,7 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/html/md_select_css.html">
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="../settings_shared_css.html">
@@ -13,7 +14,8 @@
<template>
<style include="settings-shared md-select"></style>
<div id="details">
- <div id="permissionItem" class="list-item">
+ <div id="permissionItem"
+ class$="list-item [[permissionSourceStringClass_(site.source)]]">
<div>
<iron-icon icon="[[icon]]">
</iron-icon>
@@ -21,8 +23,8 @@
<div class="middle" id="permissionHeader">
[[label]]
<div class="secondary"
- hidden$="[[!hasPermissionSourceString_(site.source)]]">
- [[permissionSourceString_(
+ hidden$="[[!hasPermissionSourceString_(site.source)]]"
+ inner-h-t-m-l="[[permissionSourceString_(
site.source,
'$i18nPolymer{siteSettingsSourceEmbargo}',
'$i18nPolymer{siteSettingsSourceInsecureOrigin}',
@@ -32,13 +34,14 @@
'$i18nPolymer{siteSettingsSourceExtensionAsk}',
'$i18nPolymer{siteSettingsSourcePolicyAllow}',
'$i18nPolymer{siteSettingsSourcePolicyBlock}',
- '$i18nPolymer{siteSettingsSourcePolicyAsk}')]]
+ '$i18nPolymer{siteSettingsSourcePolicyAsk}')]]">
</div>
</div>
<div class="md-select-wrapper">
<select id="permission" class="md-select"
aria-labelledby="permissionHeader"
- on-change="onPermissionSelectionChange_">
+ on-change="onPermissionSelectionChange_"
+ disabled$="[[!isPermissionUserControlled_(site.source)]]">
<option id="default" value$="[[ContentSetting.DEFAULT]]">
[[defaultSettingString_(
defaultSetting_,