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

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

Issue 2769303004: [MD setting] tool tips on controlledBy site exceptions (Closed)
Patch Set: Created 3 years, 9 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/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">
2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 3 <link rel="import" href="chrome://resources/cr_elements/icons.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
4 <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">
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/iron-icon/iron-icon.htm l">
6 <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">
7 <link rel="import" href="../i18n_setup.html"> 8 <link rel="import" href="../i18n_setup.html">
8 <link rel="import" href="../icons.html"> 9 <link rel="import" href="../icons.html">
9 <link rel="import" href="../route.html"> 10 <link rel="import" href="../route.html">
10 <link rel="import" href="../settings_shared_css.html"> 11 <link rel="import" href="../settings_shared_css.html">
11 <link rel="import" href="add_site_dialog.html"> 12 <link rel="import" href="add_site_dialog.html">
12 <link rel="import" href="constants.html"> 13 <link rel="import" href="constants.html">
13 <link rel="import" href="edit_exception_dialog.html"> 14 <link rel="import" href="edit_exception_dialog.html">
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 <div class="list-frame menu-content vertical-list" id="listContainer"> 66 <div class="list-frame menu-content vertical-list" id="listContainer">
66 <template is="dom-repeat" items="[[sites]]"> 67 <template is="dom-repeat" items="[[sites]]">
67 <div class="list-item" actionable$="[[enableSiteSettings_]]" 68 <div class="list-item" actionable$="[[enableSiteSettings_]]"
68 on-tap="onOriginTap_"> 69 on-tap="onOriginTap_">
69 <div class="favicon-image" 70 <div class="favicon-image"
70 style$="[[computeSiteIcon(item.origin)]]"> 71 style$="[[computeSiteIcon(item.origin)]]">
71 </div> 72 </div>
72 <div class="middle no-min-width"> 73 <div class="middle no-min-width">
73 <div class="selectable text-elide">[[item.displayName]]</div> 74 <div class="selectable text-elide">[[item.displayName]]</div>
74 75
75 <!-- This div must not contain extra whitespace. --> 76 <!-- This div must not contain extra white-space. -->
tommycli 2017/03/27 16:02:07 nitpick: i think 'whitespace' is more common in ou
dschuyler 2017/03/28 01:05:53 Done.
76 <div class="selectable secondary text-elide" id="siteDescription" 77 <div class="selectable secondary text-elide" id="siteDescription"
77 >[[computeSiteDescription_(item)]]</div> 78 >[[computeSiteDescription_(item)]]</div>
78 </div> 79 </div>
79 80 <template is="dom-if" if="[[item.controlledBy]]">
80 <template is="dom-if" if="[[!!computeIconControlledBy_(item)]]"> 81 <cr-policy-pref-indicator pref="[[item]]"
81 <iron-icon icon="[[computeIconControlledBy_(item)]]"></iron-icon> 82 icon-aria-label="[[label]]">
83 </cr-policy-pref-indicator>
82 </template> 84 </template>
83 85
84 <paper-icon-button id="resetSite" icon="cr:delete" 86 <paper-icon-button id="resetSite" icon="cr:delete"
85 hidden="[[isResetButtonHidden_(item.source, readOnlyList)]]" 87 hidden="[[isResetButtonHidden_(
88 item.enforcement, readOnlyList)]]"
86 on-tap="onResetButtonTap_" alt="$i18n{siteSettingsActionReset}"> 89 on-tap="onResetButtonTap_" alt="$i18n{siteSettingsActionReset}">
87 </paper-icon-button> 90 </paper-icon-button>
88 <paper-icon-button id="actionMenuButton" icon="cr:more-vert" 91 <paper-icon-button id="actionMenuButton" icon="cr:more-vert"
89 hidden="[[isActionMenuHidden_(item.source, readOnlyList)]]" 92 hidden="[[isActionMenuHidden_(item.enforcement, readOnlyList)]]"
90 on-tap="onShowActionMenuTap_" title="$i18n{moreActions}"> 93 on-tap="onShowActionMenuTap_" title="$i18n{moreActions}">
91 </paper-icon-button> 94 </paper-icon-button>
92 <template is="dom-if" if="[[enableSiteSettings_]]"> 95 <template is="dom-if" if="[[enableSiteSettings_]]">
93 <div on-tap="onOriginTap_" actionable> 96 <div on-tap="onOriginTap_" actionable>
94 <button class="subpage-arrow" is="paper-icon-button-light" 97 <button class="subpage-arrow" is="paper-icon-button-light"
95 aria-label$="[[item.displayName]]" 98 aria-label$="[[item.displayName]]"
96 aria-describedby="siteDescription"></button> 99 aria-describedby="siteDescription"></button>
97 </div> 100 </div>
98 </template> 101 </template>
99 </div> 102 </div>
100 </template> 103 </template>
101 </div> 104 </div>
102 </div> 105 </div>
103 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp> 106 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp>
104 <settings-edit-exception-dialog model="[[actionMenuSite_]]" 107 <settings-edit-exception-dialog model="[[actionMenuSite_]]"
105 on-close="onEditExceptionDialogClosed_"> 108 on-close="onEditExceptionDialogClosed_">
106 </settings-edit-exception-dialog> 109 </settings-edit-exception-dialog>
107 </template> 110 </template>
108 </template> 111 </template>
109 <script src="site_list.js"></script> 112 <script src="site_list.js"></script>
110 </dom-module> 113 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698