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

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: merge with master 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
« no previous file with comments | « chrome/browser/resources/settings/site_settings/site_data.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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-flex-layout/iron-f lex-layout-classes.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
7 <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/iron-icon/iron-icon.htm l">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
9 <link rel="import" href="../i18n_setup.html"> 9 <link rel="import" href="../i18n_setup.html">
10 <link rel="import" href="../icons.html"> 10 <link rel="import" href="../icons.html">
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 <!-- This div must not contain extra whitespace. --> 74 <!-- This div must not contain extra whitespace. -->
75 <div class="selectable secondary text-elide" 75 <div class="selectable secondary text-elide"
76 id="siteDescription">[[computeSiteDescription_(item)]]</div> 76 id="siteDescription">[[computeSiteDescription_(item)]]</div>
77 </div> 77 </div>
78 <template is="dom-if" if="[[enableSiteSettings_]]"> 78 <template is="dom-if" if="[[enableSiteSettings_]]">
79 <div on-tap="onOriginTap_" actionable> 79 <div on-tap="onOriginTap_" actionable>
80 <button class="subpage-arrow" is="paper-icon-button-light" 80 <button class="subpage-arrow" is="paper-icon-button-light"
81 aria-label$="[[item.displayName]]" 81 aria-label$="[[item.displayName]]"
82 aria-describedby="siteDescription"></button> 82 aria-describedby="siteDescription"></button>
83 </div> 83 </div>
84 <!-- This div is intentionally empty. It creates a vertical grey 84 <div class="separator"></div>
85 bar. This can be merged into the html that follows this
86 template after the |enableSiteSettings_| is removed. -->
87 <div class="secondary-action"></div>
88 </template> 85 </template>
89 </div> 86 </div>
90 <template is="dom-if" if="[[item.controlledBy]]"> 87 <template is="dom-if" if="[[item.controlledBy]]">
91 <cr-policy-pref-indicator pref="[[item]]" 88 <cr-policy-pref-indicator pref="[[item]]"
92 icon-aria-label="[[label]]"> 89 icon-aria-label="[[label]]">
93 </cr-policy-pref-indicator> 90 </cr-policy-pref-indicator>
94 </template> 91 </template>
95 92
96 <paper-icon-button id="resetSite" icon="cr:delete" 93 <paper-icon-button id="resetSite" icon="cr:delete"
97 hidden="[[isResetButtonHidden_( 94 hidden="[[isResetButtonHidden_(
(...skipping 11 matching lines...) Expand all
109 </div> 106 </div>
110 </div> 107 </div>
111 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp> 108 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp>
112 <settings-edit-exception-dialog model="[[actionMenuSite_]]" 109 <settings-edit-exception-dialog model="[[actionMenuSite_]]"
113 on-close="onEditExceptionDialogClosed_"> 110 on-close="onEditExceptionDialogClosed_">
114 </settings-edit-exception-dialog> 111 </settings-edit-exception-dialog>
115 </template> 112 </template>
116 </template> 113 </template>
117 <script src="site_list.js"></script> 114 <script src="site_list.js"></script>
118 </dom-module> 115 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/site_settings/site_data.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698