Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7489)

Unified Diff: chrome/browser/resources/settings/site_settings_page/site_settings_page.html

Issue 1998673002: Desktop MD Site Settings: Re-order the permission list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..fb04f05e4a865e3d9d3f5e83d1b2ea7dcbb5f9af 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
@@ -10,6 +10,7 @@
<template>
<style include="settings-shared">
</style>
+ <!-- The order of the following items from: http://crbug.com/610358. -->
michaelpg 2016/05/23 18:14:22 same
Finnur 2016/05/25 18:41:29 Done.
<div class="settings-box first" category$="[[ALL_SITES]]"
on-tap="onTapCategory">
<iron-icon icon="settings:list"></iron-icon>
@@ -54,32 +55,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 +83,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>

Powered by Google App Engine
This is Rietveld 408576698