Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_dialog/cr_dialog.html "> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.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/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.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/paper-icon-button/paper -icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 6 <link rel="import" href="../settings_page/settings_subpage_search.html"> | 7 <link rel="import" href="../settings_page/settings_subpage_search.html"> |
| 7 <link rel="import" href="../settings_shared_css.html"> | 8 <link rel="import" href="../settings_shared_css.html"> |
| 8 <link rel="import" href="cookie_tree_behavior.html"> | 9 <link rel="import" href="cookie_tree_behavior.html"> |
| 9 <link rel="import" href="site_settings_behavior.html"> | 10 <link rel="import" href="site_settings_behavior.html"> |
| 10 | 11 |
| 11 <dom-module id="site-data"> | 12 <dom-module id="site-data"> |
| 12 <template> | 13 <template> |
| 13 <style include="settings-shared"> | 14 <style include="settings-shared"> |
| 14 paper-button#removeButton { | 15 #removeAll { |
| 15 -webkit-margin-start: auto; | 16 -webkit-margin-start: auto; |
| 16 } | 17 } |
| 17 | 18 |
| 19 #removeSecondary { | |
| 20 -webkit-padding-start: 0; | |
| 21 } | |
| 22 | |
| 23 .remove-site { | |
| 24 -webkit-margin-end: 0; | |
| 25 } | |
| 26 | |
| 18 .subtitle-row { | 27 .subtitle-row { |
| 19 margin-top: 9px; /* With 15px in sub-items == 24px total margin. */ | 28 margin-top: 9px; /* With 15px in sub-items == 24px total margin. */ |
| 20 } | 29 } |
| 21 </style> | 30 </style> |
| 22 <div class="settings-box first subtitle-row"> | 31 <div class="settings-box first subtitle-row"> |
| 23 <div class="start"> | 32 <div class="start"> |
| 24 <div>$i18n{siteSettingsCookieHeader}</div> | 33 <div>$i18n{siteSettingsCookieHeader}</div> |
| 25 </div> | 34 </div> |
| 26 <settings-subpage-search id="filter" on-search-changed="onSearchChanged_" | 35 <settings-subpage-search id="filter" on-search-changed="onSearchChanged_" |
| 27 label="$i18n{siteSettingsCookieSearch}"> | 36 label="$i18n{siteSettingsCookieSearch}"> |
| 28 </settings-subpage-search> | 37 </settings-subpage-search> |
| 29 </div> | 38 </div> |
| 30 <div class="settings-box continuation"> | 39 <div class="settings-box continuation"> |
| 31 <paper-button class="secondary-button" id="removeButton" | 40 <paper-button class="secondary-button" id="removeAll" |
| 32 on-tap="onConfirmDeleteMultipleSites_" | 41 on-tap="onRemoveAllTap_" |
|
dschuyler
2017/02/13 20:14:35
Can we call this removeAllShown, removeShownSites,
Dan Beam
2017/02/14 04:14:03
Done.
| |
| 33 hidden$="[[!isRemoveButtonVisible_(sites, renderedItemCount)]]"> | 42 hidden$="[[!isRemoveButtonVisible_(sites, renderedItemCount)]]"> |
| 34 [[computeRemoveLabel_(filterString_)]] | 43 [[computeRemoveLabel_(filterString_)]] |
| 35 </paper-button> | 44 </paper-button> |
| 36 </div> | 45 </div> |
| 37 <div class="list-frame vertical-list"> | 46 <div class="list-frame vertical-list"> |
| 38 <template is="dom-repeat" id="list" items="[[sites]]" filter="showItem_" | 47 <template is="dom-repeat" id="list" items="[[sites]]" filter="showItem_" |
| 39 rendered-item-count="{{renderedItemCount}}"> | 48 rendered-item-count="{{renderedItemCount}}"> |
| 40 <div class="list-item two-line" on-tap="onSiteTap_" actionable> | 49 <div class="list-item two-line" on-tap="onSiteTap_" actionable> |
| 41 <div class="favicon-image" style$="[[computeSiteIcon(item.site)]]"> | 50 <div class="favicon-image" style$="[[computeSiteIcon(item.site)]]"> |
| 42 </div> | 51 </div> |
| 43 <div class="middle"> | 52 <div class="middle"> |
| 44 [[item.site]] | 53 [[item.site]] |
| 45 <div class="secondary">[[item.localData]]</div> | 54 <div class="secondary">[[item.localData]]</div> |
| 46 </div> | 55 </div> |
| 47 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 56 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 57 <div class="secondary-action" id="removeSecondary"> | |
| 58 <button is="paper-icon-button-light" class="remove-site" | |
| 59 on-tap="onRemoveSiteTap_"> | |
| 60 <iron-icon icon="cr:delete"></iron-icon> | |
| 61 </button> | |
| 62 </div> | |
| 48 </div> | 63 </div> |
| 49 </template> | 64 </template> |
| 50 </div> | 65 </div> |
| 51 | 66 |
| 52 <!-- Confirm Delete dialog --> | 67 <!-- Confirm Delete dialog --> |
| 53 <dialog is="cr-dialog" id="confirmDeleteDialog"> | 68 <dialog is="cr-dialog" id="confirmDeleteDialog"> |
| 54 <div class="title">$i18n{siteSettingsCookieRemoveDialogTitle}</div> | 69 <div class="title">$i18n{siteSettingsCookieRemoveDialogTitle}</div> |
| 55 <div class="body">[[confirmationDeleteMsg_]]</div> | 70 <div class="body">[[confirmationDeleteMsg_]]</div> |
| 56 <div class="button-container"> | 71 <div class="button-container"> |
| 57 <paper-button class="cancel-button" on-tap="onCloseDialog_"> | 72 <paper-button class="cancel-button" on-tap="onCloseDialog_"> |
| 58 $i18n{cancel} | 73 $i18n{cancel} |
| 59 </paper-button> | 74 </paper-button> |
| 60 <paper-button class="action-button" on-tap="onConfirmDelete_"> | 75 <paper-button class="action-button" on-tap="onConfirmDelete_"> |
| 61 $i18n{siteSettingsCookiesClearAll} | 76 $i18n{siteSettingsCookiesClearAll} |
| 62 </paper-button> | 77 </paper-button> |
| 63 </div> | 78 </div> |
| 64 </dialog> | 79 </dialog> |
| 65 </template> | 80 </template> |
| 66 <script src="cookie_info.js"></script> | 81 <script src="cookie_info.js"></script> |
| 67 <script src="cookie_tree_node.js"></script> | 82 <script src="cookie_tree_node.js"></script> |
| 68 <script src="site_data.js"></script> | 83 <script src="site_data.js"></script> |
| 69 </dom-module> | 84 </dom-module> |
| OLD | NEW |