Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 4 <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/paper-button/paper-butt on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 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="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu-button/paper -menu-button.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu-button/paper -menu-button.html"> |
| 10 <link rel="import" href="/i18n_setup.html"> | 10 <link rel="import" href="/i18n_setup.html"> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 59 <div class="selectable">[[item.originForDisplay]]</div> | 59 <div class="selectable">[[item.originForDisplay]]</div> |
| 60 <div class="selectable secondary"> | 60 <div class="selectable secondary"> |
| 61 [[item.embeddingOriginForDisplay]] | 61 [[item.embeddingOriginForDisplay]] |
| 62 </div> | 62 </div> |
| 63 </div> | 63 </div> |
| 64 </div> | 64 </div> |
| 65 | 65 |
| 66 <template is="dom-if" if="[[isPolicyControlled_(item.source)]]"> | 66 <template is="dom-if" if="[[isPolicyControlled_(item.source)]]"> |
| 67 <iron-icon icon="cr:domain"></iron-icon> | 67 <iron-icon icon="cr:domain"></iron-icon> |
| 68 </template> | 68 </template> |
| 69 <template is="dom-if" if="[[shouldShowMenu_(item.source)]]"> | 69 <paper-menu-button hidden="[[isPolicyControlled_(item.source)]]"> |
|
tommycli
2016/08/10 17:31:23
shouldShowMenu still exists in the js file.
Also
dschuyler
2016/08/10 18:26:47
Done.
| |
| 70 <paper-menu-button> | 70 <paper-icon-button icon="cr:more-vert" class="dropdown-trigger"> |
| 71 <paper-icon-button icon="cr:more-vert" | 71 </paper-icon-button> |
| 72 class="dropdown-trigger"> | 72 <paper-menu id="actionMenu" class="dropdown-content" |
| 73 </paper-icon-button> | 73 on-iron-activate="onActionMenuIronActivate_" |
| 74 <paper-menu id="actionMenu" class="dropdown-content" | 74 attr-for-selected="menu-value"> |
| 75 on-iron-activate="onActionMenuIronActivate_" | 75 <paper-item |
| 76 attr-for-selected="menu-value"> | 76 hidden="[[!showAllowAction_]]" |
| 77 <paper-item | 77 menu-value$="[[PermissionValues.ALLOW]]"> |
| 78 hidden="[[!showAllowAction_]]" | 78 $i18n{siteSettingsActionAllow} |
| 79 menu-value$="[[PermissionValues.ALLOW]]"> | 79 </paper-item> |
| 80 $i18n{siteSettingsActionAllow} | 80 <paper-item |
| 81 </paper-item> | 81 hidden="[[!showBlockAction_]]" |
| 82 <paper-item | 82 menu-value$="[[PermissionValues.BLOCK]]"> |
| 83 hidden="[[!showBlockAction_]]" | 83 $i18n{siteSettingsActionBlock} |
| 84 menu-value$="[[PermissionValues.BLOCK]]"> | 84 </paper-item> |
| 85 $i18n{siteSettingsActionBlock} | 85 <paper-item |
| 86 </paper-item> | 86 hidden="[[!showSessionOnlyAction_]]" |
| 87 <paper-item | 87 menu-value$="[[PermissionValues.SESSION_ONLY]]"> |
| 88 hidden="[[!showSessionOnlyAction_]]" | 88 $i18n{siteSettingsActionSessionOnly} |
| 89 menu-value$="[[PermissionValues.SESSION_ONLY]]"> | 89 </paper-item> |
| 90 $i18n{siteSettingsActionSessionOnly} | 90 <paper-item |
| 91 </paper-item> | 91 menu-value$="[[PermissionValues.DEFAULT]]"> |
| 92 <paper-item | 92 $i18n{siteSettingsActionReset} |
| 93 menu-value$="[[PermissionValues.DEFAULT]]"> | 93 </paper-item> |
| 94 $i18n{siteSettingsActionReset} | 94 </paper-menu> |
| 95 </paper-item> | 95 </paper-menu-button> |
| 96 </paper-menu> | |
| 97 </paper-menu-button> | |
| 98 </template> | |
| 99 </div> | 96 </div> |
| 100 </template> | 97 </template> |
| 101 | 98 |
| 102 <template is="dom-if" if="[[!allSites]]"> | 99 <template is="dom-if" if="[[!allSites]]"> |
| 103 <div class="button-container"> | 100 <div class="button-container"> |
| 104 <paper-button on-tap="onAddSiteTap_" | 101 <paper-button on-tap="onAddSiteTap_" |
| 105 class="primary-button no-upper"> | 102 class="primary-button no-upper"> |
| 106 $i18n{addSiteLink} | 103 $i18n{addSiteLink} |
| 107 </paper-button> | 104 </paper-button> |
| 108 </div> | 105 </div> |
| 109 </template> | 106 </template> |
| 110 </div> | 107 </div> |
| 111 </paper-submenu> | 108 </paper-submenu> |
| 112 </template> | 109 </template> |
| 113 <script src="site_list.js"></script> | 110 <script src="site_list.js"></script> |
| 114 </dom-module> | 111 </dom-module> |
| OLD | NEW |