| 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 32654af799b9216bfe36c8b192f5cf76b5443957..a98a16f2768aedce17407dbbd318cfb110392886 100644
|
| --- a/chrome/browser/resources/settings/site_settings/site_settings_category.html
|
| +++ b/chrome/browser/resources/settings/site_settings/site_settings_category.html
|
| @@ -2,35 +2,54 @@
|
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/av-icons.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/communication-icons.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/social-icons.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.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">
|
| <link rel="import" href="chrome://md-settings/prefs/prefs.html">
|
| +<link rel="import" href="chrome://md-settings/settings_page/settings_animated_pages.html">
|
| +<link rel="import" href="chrome://md-settings/settings_page/settings_subheader.html">
|
| <link rel="import" href="chrome://md-settings/site_settings/constants.html">
|
| <link rel="import" href="chrome://md-settings/site_settings/site_list.html">
|
| <link rel="import" href="chrome://md-settings/site_settings/site_settings_behavior.html">
|
| +<link rel="import" href="chrome://md-settings/site_settings/site_details.html">
|
|
|
| <dom-module id="site-settings-category">
|
| <link rel="import" type="css"
|
| href="chrome://md-settings/settings_page/settings_page.css">
|
| <link rel="import" type="css" href="site_settings_category.css">
|
| <template>
|
| - <paper-icon-item>
|
| - <iron-icon icon="[[computeIconForContentCategory(category)]]" item-icon
|
| - ></iron-icon>
|
| - <paper-item-body two-line class="flex">
|
| - <div>[[computeTitleForContentCategory(category)]]</div>
|
| - <div secondary>[[computeCategoryDesc(category, categoryEnabled)]]</div>
|
| - </paper-item-body>
|
| - <paper-toggle-button id="toggle" checked="{{categoryEnabled}}"
|
| - on-change="onToggleChange_"></paper-toggle-button>
|
| - </paper-icon-item>
|
| - <settings-site-list id="blockList"
|
| - prefs="{{prefs}}" category="[[category]]"
|
| - category-enabled="[[categoryEnabled]]"></settings-site-list>
|
| - <settings-site-list id="allowList"
|
| - prefs="{{prefs}}" category="[[category]]"
|
| - category-enabled="[[categoryEnabled]]"></settings-site-list>
|
| + <settings-animated-pages id="pages" current-route="{{currentRoute}}"
|
| + section="privacy">
|
| + <neon-animatable id="main">
|
| + <paper-icon-item>
|
| + <iron-icon icon="[[computeIconForContentCategory(category)]]"
|
| + item-icon></iron-icon>
|
| + <paper-item-body two-line class="flex">
|
| + <div>[[computeTitleForContentCategory(category)]]</div>
|
| + <div secondary
|
| + >[[computeCategoryDesc(category, categoryEnabled)]]</div>
|
| + </paper-item-body>
|
| + <paper-toggle-button id="toggle" checked="{{categoryEnabled}}"
|
| + on-change="onToggleChange_"></paper-toggle-button>
|
| + </paper-icon-item>
|
| + <settings-site-list id="blockList"
|
| + prefs="{{prefs}}" category="[[category]]"
|
| + category-enabled="[[categoryEnabled]]"
|
| + selected-origin="{{selectedOrigin}}"></settings-site-list>
|
| + <settings-site-list id="allowList"
|
| + prefs="{{prefs}}" category="[[category]]"
|
| + category-enabled="[[categoryEnabled]]"
|
| + selected-origin="{{selectedOrigin}}"></settings-site-list>
|
| + </neon-animatable>
|
| + <neon-animatable id="site-details">
|
| + <settings-subheader
|
| + page-title="[[computeTitleForContentCategory(category)]]">
|
| + </settings-subheader>
|
| + <site-details prefs="{{prefs}}"
|
| + origin="{{selectedOrigin}}"></site-details>
|
| + </neon-animatable>
|
| + </settings-animated-pages>
|
| </template>
|
| <script src="site_settings_category.js"></script>
|
| </dom-module>
|
|
|