Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 74 | 74 |
| 75 <!-- This div must not contain extra whitespace. --> | 75 <!-- This div must not contain extra whitespace. --> |
| 76 <div class="selectable secondary text-elide" id="siteDescription" | 76 <div class="selectable secondary text-elide" id="siteDescription" |
| 77 >[[computeSiteDescription_(item)]]</div> | 77 >[[computeSiteDescription_(item)]]</div> |
| 78 </div> | 78 </div> |
| 79 | 79 |
| 80 <template is="dom-if" if="[[!!computeIconControlledBy_(item)]]"> | 80 <template is="dom-if" if="[[!!computeIconControlledBy_(item)]]"> |
| 81 <iron-icon icon="[[computeIconControlledBy_(item)]]"></iron-icon> | 81 <iron-icon icon="[[computeIconControlledBy_(item)]]"></iron-icon> |
| 82 </template> | 82 </template> |
| 83 | 83 |
| 84 <paper-icon-button id="dots" icon="cr:more-vert" | 84 <paper-icon-button id="resetSite" icon="cr:delete" |
| 85 hidden="[[!readOnlyList]]" on-tap="onResetButtonTap_" | |
|
dschuyler
2017/03/22 18:33:08
What will happen if this is policy enforced?
I loo
tommycli
2017/03/22 21:05:37
Done.
| |
| 86 alt="$i18n{siteSettingsActionReset}"> | |
| 87 </paper-icon-button> | |
| 88 <paper-icon-button id="actionMenuButton" icon="cr:more-vert" | |
|
dschuyler
2017/03/22 18:33:08
FYI (doesn't necessarily require a change)
I'm no
tommycli
2017/03/22 21:05:37
Acknowledged.
| |
| 85 hidden="[[isActionMenuHidden_(item.source, readOnlyList)]]" | 89 hidden="[[isActionMenuHidden_(item.source, readOnlyList)]]" |
| 86 on-tap="onShowActionMenuTap_" title="$i18n{moreActions}"> | 90 on-tap="onShowActionMenuTap_" title="$i18n{moreActions}"> |
| 87 </paper-icon-button> | 91 </paper-icon-button> |
| 88 <template is="dom-if" if="[[enableSiteSettings_]]"> | 92 <template is="dom-if" if="[[enableSiteSettings_]]"> |
| 89 <div on-tap="onOriginTap_" actionable> | 93 <div on-tap="onOriginTap_" actionable> |
| 90 <button class="subpage-arrow" is="paper-icon-button-light" | 94 <button class="subpage-arrow" is="paper-icon-button-light" |
| 91 aria-label$="[[item.displayName]]" | 95 aria-label$="[[item.displayName]]" |
| 92 aria-describedby="siteDescription"></button> | 96 aria-describedby="siteDescription"></button> |
| 93 </div> | 97 </div> |
| 94 </template> | 98 </template> |
| 95 </div> | 99 </div> |
| 96 </template> | 100 </template> |
| 97 </div> | 101 </div> |
| 98 </div> | 102 </div> |
| 99 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp> | 103 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp> |
| 100 <settings-edit-exception-dialog model="[[actionMenuSite_]]" | 104 <settings-edit-exception-dialog model="[[actionMenuSite_]]" |
| 101 on-close="onEditExceptionDialogClosed_"> | 105 on-close="onEditExceptionDialogClosed_"> |
| 102 </settings-edit-exception-dialog> | 106 </settings-edit-exception-dialog> |
| 103 </template> | 107 </template> |
| 104 </template> | 108 </template> |
| 105 <script src="site_list.js"></script> | 109 <script src="site_list.js"></script> |
| 106 </dom-module> | 110 </dom-module> |
| OLD | NEW |