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

Side by Side Diff: chrome/browser/resources/settings/site_settings/site_list.html

Issue 2468363005: [MD settings] show blocked sites even when category is blocked (Closed)
Patch Set: unit test changes Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html"> 1 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html">
2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 2 <link rel="import" href="chrome://resources/cr_elements/icons.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
7 <link rel="import" href="/i18n_setup.html"> 7 <link rel="import" href="/i18n_setup.html">
8 <link rel="import" href="/icons.html"> 8 <link rel="import" href="/icons.html">
9 <link rel="import" href="/route.html"> 9 <link rel="import" href="/route.html">
10 <link rel="import" href="/settings_shared_css.html"> 10 <link rel="import" href="/settings_shared_css.html">
(...skipping 11 matching lines...) Expand all
22 22
23 paper-icon-button { 23 paper-icon-button {
24 left: 8px; 24 left: 8px;
25 right: 8px; 25 right: 8px;
26 } 26 }
27 27
28 .selectable { 28 .selectable {
29 -webkit-user-select: text; 29 -webkit-user-select: text;
30 } 30 }
31 </style> 31 </style>
32 <div id="category" hidden> 32 <div id="category">
33 <div class="settings-box first" hidden$="[[allSites]]"> 33 <div class="settings-box first" hidden$="[[allSites]]">
34 <h2 class="start">[[categoryHeader]]</h2> 34 <h2 class="start">[[categoryHeader]]</h2>
35 <paper-button class="secondary-button" id="icon" on-tap="onAddSiteTap_"> 35 <paper-button class="secondary-button" id="icon" on-tap="onAddSiteTap_">
36 $i18n{add} 36 $i18n{add}
37 </paper-button> 37 </paper-button>
38 </div> 38 </div>
39 39
40 <dialog is="cr-action-menu"> 40 <dialog is="cr-action-menu">
41 <button class="dropdown-item" role="option" id="allow" 41 <button class="dropdown-item" role="option" id="allow"
42 on-tap="onAllowTap_" hidden$="[[!showAllowAction_]]"> 42 on-tap="onAllowTap_" hidden$="[[!showAllowAction_]]">
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 </button> 91 </button>
92 </div> 92 </div>
93 </template> 93 </template>
94 </div> 94 </div>
95 </template> 95 </template>
96 </div> 96 </div>
97 </div> 97 </div>
98 </template> 98 </template>
99 <script src="site_list.js"></script> 99 <script src="site_list.js"></script>
100 </dom-module> 100 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698