| Index: chrome/browser/resources/settings/site_settings/site_settings_category.html
|
| diff --git a/chrome/browser/resources/settings/site_settings/site_settings_category.html b/chrome/browser/resources/settings/site_settings/site_settings_category.html
|
| index 252cc934054c6f214cf8357c689836ce6ae7046c..4b19884b6a11af480ad56b3a0d5f64b73a00eef5 100644
|
| --- a/chrome/browser/resources/settings/site_settings/site_settings_category.html
|
| +++ b/chrome/browser/resources/settings/site_settings/site_settings_category.html
|
| @@ -1,4 +1,5 @@
|
| <link rel="import" href="chrome://resources/html/polymer.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-icon-item.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item-body.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
|
| @@ -40,15 +41,24 @@
|
| <content select=".media-picker"></content>
|
|
|
| <div class="settings-box first two-line">
|
| - <div class="start secondary">
|
| - [[computeCategoryDesc(category, categoryEnabled, showRecommendation)]]
|
| - </div>
|
| + <div class="start secondary">[[sliderDescription_]]</div>
|
| <paper-toggle-button id="toggle" checked="{{categoryEnabled}}"
|
| - on-change="onToggleChange_"></paper-toggle-button>
|
| + on-change="onChangePermissionControl_"></paper-toggle-button>
|
| </div>
|
|
|
| <content select=".cookie-controls"></content>
|
|
|
| + <template is="dom-if" if="[[isFlashCategory_(category)]]">
|
| + <div class="settings-box two-line">
|
| + <paper-checkbox id="flashAskCheckbox" checked="{{flashAskFirst_}}"
|
| + on-change="onChangePermissionControl_"
|
| + disabled="[[!categoryEnabled]]">
|
| + <div>$i18n{siteSettingsFlashAskBefore}</div>
|
| + <div class="secondary">$i18n{siteSettingsFlashAskBeforeSubtitle}</div>
|
| + </paper-checkbox>
|
| + </div>
|
| + </template>
|
| +
|
| <site-list
|
| category="[[category]]"
|
| category-subtype="[[PermissionValues.BLOCK]]"
|
|
|