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-dropdown/iron-drop down.html"> | |
| 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/iron-icon/iron-icon.htm l"> |
| 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-button/paper-butt on.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-icon-button/paper -icon-button.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
|
dpapad
2016/10/04 20:58:44
Is this used anymore?
Finnur
2016/10/05 10:29:43
Nope, gone.
| |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> | |
| 9 <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/paper-submen u.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu-button/paper -menu-button.html"> | |
| 11 <link rel="import" href="/i18n_setup.html"> | 10 <link rel="import" href="/i18n_setup.html"> |
| 12 <link rel="import" href="/icons.html"> | 11 <link rel="import" href="/icons.html"> |
| 13 <link rel="import" href="/route.html"> | 12 <link rel="import" href="/route.html"> |
| 14 <link rel="import" href="/settings_shared_css.html"> | 13 <link rel="import" href="/settings_shared_css.html"> |
| 15 <link rel="import" href="/site_settings/add_site_dialog.html"> | 14 <link rel="import" href="/site_settings/add_site_dialog.html"> |
| 16 <link rel="import" href="/site_settings/constants.html"> | 15 <link rel="import" href="/site_settings/constants.html"> |
| 17 <link rel="import" href="/site_settings/site_settings_behavior.html"> | 16 <link rel="import" href="/site_settings/site_settings_behavior.html"> |
| 18 <link rel="import" href="/site_settings/site_settings_prefs_browser_proxy.html"> | 17 <link rel="import" href="/site_settings/site_settings_prefs_browser_proxy.html"> |
| 19 | 18 |
| 20 <dom-module id="site-list"> | 19 <dom-module id="site-list"> |
| 21 <template> | 20 <template> |
| 22 <style include="settings-shared"> | 21 <style include="settings-shared"> |
| 23 paper-menu-button { | 22 paper-icon-button { |
| 24 left: 8px; | 23 left: 8px; |
| 25 margin: 0; | |
| 26 padding: 0; | |
| 27 right: 8px; | 24 right: 8px; |
| 28 } | 25 } |
| 29 | 26 |
| 30 .selectable { | 27 .selectable { |
| 31 -webkit-user-select: text; | 28 -webkit-user-select: text; |
| 32 } | 29 } |
| 33 </style> | 30 </style> |
| 34 <paper-submenu id="category" hidden | 31 <paper-submenu id="category" hidden |
| 35 on-paper-submenu-open="onToggle_" on-paper-submenu-close="onToggle_"> | 32 on-paper-submenu-open="onToggle_" on-paper-submenu-close="onToggle_"> |
| 36 <div class="menu-trigger settings-box" hidden$="[[allSites]]" actionable> | 33 <div class="menu-trigger settings-box" hidden$="[[allSites]]" actionable> |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 53 <div class="selectable secondary"> | 50 <div class="selectable secondary"> |
| 54 [[computeSiteDescription_(item)]] | 51 [[computeSiteDescription_(item)]] |
| 55 </div> | 52 </div> |
| 56 </div> | 53 </div> |
| 57 </div> | 54 </div> |
| 58 | 55 |
| 59 <template is="dom-if" if="[[!!computeIconControlledBy_(item)]]"> | 56 <template is="dom-if" if="[[!!computeIconControlledBy_(item)]]"> |
| 60 <iron-icon icon="[[computeIconControlledBy_(item)]]"></iron-icon> | 57 <iron-icon icon="[[computeIconControlledBy_(item)]]"></iron-icon> |
| 61 </template> | 58 </template> |
| 62 | 59 |
| 63 <paper-menu-button hidden="[[!shouldShowMenu_(item.source)]]" | 60 <paper-icon-button id="dots" icon="cr:more-vert" toggles |
| 64 horizontal-align="right"> | 61 active="{{item.menuOpened}}" |
| 65 <paper-icon-button icon="cr:more-vert" class="dropdown-trigger"> | 62 hidden="[[isExceptionControlled_(item.source)]]"> |
| 66 </paper-icon-button> | 63 </paper-icon-button> |
| 67 <paper-menu id="actionMenu" class="dropdown-content" | 64 <template is="dom-if" if="[[item.menuOpened]]"> |
| 68 on-iron-activate="onActionMenuIronActivate_" | 65 <iron-dropdown vertical-align="auto" horizontal-align="right" |
| 69 attr-for-selected="menu-value"> | 66 opened="{{item.menuOpened}}"> |
| 70 <paper-item | 67 <div class="dropdown-content"> |
| 71 hidden="[[!showAllowAction_]]" actionable | 68 <button class="dropdown-item" role="option" id="allow" |
| 72 menu-value$="[[PermissionValues.ALLOW]]"> | 69 on-tap="onAllowTap_" hidden$="[[!showAllowAction_]]"> |
| 73 $i18n{siteSettingsActionAllow} | 70 $i18n{siteSettingsActionAllow} |
| 74 </paper-item> | 71 </button> |
| 75 <paper-item | 72 <button class="dropdown-item" role="option" id="block" |
| 76 hidden="[[!showBlockAction_]]" actionable | 73 on-tap="onBlockTap_" hidden$="[[!showBlockAction_]]"> |
| 77 menu-value$="[[PermissionValues.BLOCK]]"> | 74 $i18n{siteSettingsActionBlock} |
| 78 $i18n{siteSettingsActionBlock} | 75 </button> |
| 79 </paper-item> | 76 <button class="dropdown-item" role="option" id="sessionOnly" |
| 80 <paper-item | 77 on-tap="onSessionOnlyTap_" |
| 81 hidden="[[!showSessionOnlyActionForSite_(item)]]" actionable | 78 hidden$="[[!showSessionOnlyActionForSite_(item)]]"> |
| 82 menu-value$="[[PermissionValues.SESSION_ONLY]]"> | 79 $i18n{siteSettingsActionSessionOnly} |
| 83 $i18n{siteSettingsActionSessionOnly} | 80 </button> |
| 84 </paper-item> | 81 <button class="dropdown-item" role="option" id="reset" |
| 85 <paper-item | 82 on-tap="onResetTap_"> |
| 86 menu-value$="[[PermissionValues.DEFAULT]]" actionable> | 83 $i18n{siteSettingsActionReset} |
| 87 $i18n{siteSettingsActionReset} | 84 </button> |
| 88 </paper-item> | 85 </div> |
| 89 </paper-menu> | 86 </iron-dropdown> |
| 90 </paper-menu-button> | 87 </template> |
| 91 <div on-tap="onOriginTap_" actionable> | |
| 92 <button class="icon-arrow-right" is="paper-icon-button-light"> | |
| 93 </button> | |
| 94 </div> | |
| 95 </div> | 88 </div> |
| 96 </template> | 89 </template> |
| 97 | 90 |
| 98 <template is="dom-if" if="[[!allSites]]"> | 91 <template is="dom-if" if="[[!allSites]]"> |
| 99 <div class="list-item list-button" on-tap="onAddSiteTap_"> | 92 <div class="list-item list-button" on-tap="onAddSiteTap_"> |
| 100 $i18n{addSiteLink} | 93 $i18n{addSiteLink} |
| 101 </div> | 94 </div> |
| 102 </template> | 95 </template> |
| 103 </div> | 96 </div> |
| 104 </paper-submenu> | 97 </paper-submenu> |
| 105 </template> | 98 </template> |
| 106 <script src="site_list.js"></script> | 99 <script src="site_list.js"></script> |
| 107 </dom-module> | 100 </dom-module> |
| OLD | NEW |