| Index: chrome/browser/resources/settings/site_settings_page/site_settings_page.html
|
| diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
|
| index 6357e183b1fdd99e78af335fbea97f1d165caaff..088f93b847a3c1516922bbba50849b755a3a1018 100644
|
| --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
|
| +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
|
| @@ -54,32 +54,23 @@
|
| </div>
|
| </div>
|
| <div class="settings-box two-line"
|
| - category$="[[ContentSettingsTypes.JAVASCRIPT]]"
|
| + category$="[[ContentSettingsTypes.NOTIFICATIONS]]"
|
| on-tap="onTapCategory">
|
| <iron-icon icon="[[computeIconForContentCategory(
|
| - ContentSettingsTypes.JAVASCRIPT)]]" item-icon=""></iron-icon>
|
| - <div class="middle">
|
| - [[computeTitleForContentCategory(ContentSettingsTypes.JAVASCRIPT)]]
|
| - <div id="javascript" class="secondary"></div>
|
| - </div>
|
| - </div>
|
| - <div class="settings-box two-line"
|
| - category$="[[ContentSettingsTypes.POPUPS]]" on-tap="onTapCategory">
|
| - <iron-icon icon="[[computeIconForContentCategory(
|
| - ContentSettingsTypes.POPUPS)]]" item-icon=""></iron-icon>
|
| + ContentSettingsTypes.NOTIFICATIONS)]]" item-icon=""></iron-icon>
|
| <div class="middle">
|
| - [[computeTitleForContentCategory(ContentSettingsTypes.POPUPS)]]
|
| - <div id="popups" class="secondary"></div>
|
| + [[computeTitleForContentCategory(ContentSettingsTypes.NOTIFICATIONS)]]
|
| + <div id="notifications" class="secondary"></div>
|
| </div>
|
| </div>
|
| <div class="settings-box two-line"
|
| - category$="[[ContentSettingsTypes.NOTIFICATIONS]]"
|
| + category$="[[ContentSettingsTypes.JAVASCRIPT]]"
|
| on-tap="onTapCategory">
|
| <iron-icon icon="[[computeIconForContentCategory(
|
| - ContentSettingsTypes.NOTIFICATIONS)]]" item-icon=""></iron-icon>
|
| + ContentSettingsTypes.JAVASCRIPT)]]" item-icon=""></iron-icon>
|
| <div class="middle">
|
| - [[computeTitleForContentCategory(ContentSettingsTypes.NOTIFICATIONS)]]
|
| - <div id="notifications" class="secondary"></div>
|
| + [[computeTitleForContentCategory(ContentSettingsTypes.JAVASCRIPT)]]
|
| + <div id="javascript" class="secondary"></div>
|
| </div>
|
| </div>
|
| <div class="settings-box two-line"
|
| @@ -91,6 +82,15 @@
|
| <div id="images" class="secondary"></div>
|
| </div>
|
| </div>
|
| + <div class="settings-box two-line"
|
| + category$="[[ContentSettingsTypes.POPUPS]]" on-tap="onTapCategory">
|
| + <iron-icon icon="[[computeIconForContentCategory(
|
| + ContentSettingsTypes.POPUPS)]]" item-icon=""></iron-icon>
|
| + <div class="middle">
|
| + [[computeTitleForContentCategory(ContentSettingsTypes.POPUPS)]]
|
| + <div id="popups" class="secondary"></div>
|
| + </div>
|
| + </div>
|
| </template>
|
| <script src="site_settings_page.js"></script>
|
| </dom-module>
|
|
|