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

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

Issue 2849663002: [MD settings] replace secondary-action with separator (Closed)
Patch Set: set upstream Created 3 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html"> 2 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html">
3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 3 <link rel="import" href="chrome://resources/cr_elements/icons.html">
4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
6 <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/iron-icon/iron-icon.htm l">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
8 <link rel="import" href="../i18n_setup.html"> 8 <link rel="import" href="../i18n_setup.html">
9 <link rel="import" href="../icons.html"> 9 <link rel="import" href="../icons.html">
10 <link rel="import" href="../route.html"> 10 <link rel="import" href="../route.html">
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 <!-- This div must not contain extra whitespace. --> 73 <!-- This div must not contain extra whitespace. -->
74 <div class="selectable secondary text-elide" 74 <div class="selectable secondary text-elide"
75 id="siteDescription">[[computeSiteDescription_(item)]]</div> 75 id="siteDescription">[[computeSiteDescription_(item)]]</div>
76 </div> 76 </div>
77 <template is="dom-if" if="[[enableSiteSettings_]]"> 77 <template is="dom-if" if="[[enableSiteSettings_]]">
78 <div on-tap="onOriginTap_" actionable> 78 <div on-tap="onOriginTap_" actionable>
79 <button class="subpage-arrow" is="paper-icon-button-light" 79 <button class="subpage-arrow" is="paper-icon-button-light"
80 aria-label$="[[item.displayName]]" 80 aria-label$="[[item.displayName]]"
81 aria-describedby="siteDescription"></button> 81 aria-describedby="siteDescription"></button>
82 </div> 82 </div>
83 <!-- This div is intentionally empty. It creates a vertical grey 83 <div class="separator"></div>
84 bar. This can be merged into the html that follows this
85 template after the |enableSiteSettings_| is removed. -->
86 <div class="secondary-action"></div>
87 </template> 84 </template>
88 </div> 85 </div>
89 <template is="dom-if" if="[[item.controlledBy]]"> 86 <template is="dom-if" if="[[item.controlledBy]]">
90 <cr-policy-pref-indicator pref="[[item]]" 87 <cr-policy-pref-indicator pref="[[item]]"
91 icon-aria-label="[[label]]"> 88 icon-aria-label="[[label]]">
92 </cr-policy-pref-indicator> 89 </cr-policy-pref-indicator>
93 </template> 90 </template>
94 91
95 <paper-icon-button id="resetSite" icon="cr:delete" 92 <paper-icon-button id="resetSite" icon="cr:delete"
96 hidden="[[isResetButtonHidden_( 93 hidden="[[isResetButtonHidden_(
(...skipping 11 matching lines...) Expand all
108 </div> 105 </div>
109 </div> 106 </div>
110 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp> 107 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp>
111 <settings-edit-exception-dialog model="[[actionMenuSite_]]" 108 <settings-edit-exception-dialog model="[[actionMenuSite_]]"
112 on-close="onEditExceptionDialogClosed_"> 109 on-close="onEditExceptionDialogClosed_">
113 </settings-edit-exception-dialog> 110 </settings-edit-exception-dialog>
114 </template> 111 </template>
115 </template> 112 </template>
116 <script src="site_list.js"></script> 113 <script src="site_list.js"></script>
117 </dom-module> 114 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698