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

Side by Side Diff: chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html

Issue 2716333002: Implement important sites dialog for desktop. (Closed)
Patch Set: fix rebase Created 3 years, 7 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/cr_elements/cr_dialog/cr_dialog.html "> 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.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/paper-button/paper-butt on.html"> 4 <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-spinner/paper-spi nner.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
6 <link rel="import" href="../i18n_setup.html"> 6 <link rel="import" href="../i18n_setup.html">
7 <link rel="import" href="clear_browsing_data_browser_proxy.html"> 7 <link rel="import" href="clear_browsing_data_browser_proxy.html">
8 <link rel="import" href="history_deletion_dialog.html"> 8 <link rel="import" href="history_deletion_dialog.html">
9 <link rel="import" href="../controls/important_site_checkbox.html">
9 <link rel="import" href="../controls/settings_checkbox.html"> 10 <link rel="import" href="../controls/settings_checkbox.html">
10 <link rel="import" href="../controls/settings_dropdown_menu.html"> 11 <link rel="import" href="../controls/settings_dropdown_menu.html">
11 <link rel="import" href="../icons.html"> 12 <link rel="import" href="../icons.html">
12 <link rel="import" href="../settings_shared_css.html"> 13 <link rel="import" href="../settings_shared_css.html">
13 14
14 <dom-module id="settings-clear-browsing-data-dialog"> 15 <dom-module id="settings-clear-browsing-data-dialog">
15 <template> 16 <template>
16 <style include="settings-shared"> 17 <style include="settings-shared">
17 #dialog:not(.fully-rendered) { 18 #clearBrowsingDataDialog:not(.fully-rendered) {
18 visibility: hidden; 19 visibility: hidden;
19 } 20 }
20 21
21 #dialog .footer { 22 #clearBrowsingDataDialog .footer {
22 color: var(--paper-grey-600); 23 color: var(--paper-grey-600);
23 } 24 }
24 25
25 .row { 26 .row {
26 align-items: center; 27 align-items: center;
27 display: flex; 28 display: flex;
28 min-height: 40px; 29 min-height: 40px;
29 } 30 }
30 31
31 paper-spinner { 32 paper-spinner {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 } 80 }
80 81
81 .clear-browsing-data-footer a { 82 .clear-browsing-data-footer a {
82 text-decoration: none; 83 text-decoration: none;
83 } 84 }
84 85
85 #clearFrom { 86 #clearFrom {
86 -webkit-margin-start: 0.5em; 87 -webkit-margin-start: 0.5em;
87 } 88 }
88 89
90 .title .secondary {
91 font-size: calc(13 / 15 * 100%);
92 padding-top: 8px;
93 }
94
89 /* Cap the height on smaller screens to avoid unfavorable clipping. 95 /* Cap the height on smaller screens to avoid unfavorable clipping.
90 * Replace the bottom margin with padding to avoid the gap between 96 * Replace the bottom margin with padding to avoid the gap between
91 * the scrollbar and the bottom separator. */ 97 * the scrollbar and the bottom separator. */
92 @media all and (max-height: 724px) { 98 @media all and (max-height: 724px) {
93 #dialog { 99 #clearBrowsingDataDialog {
94 /* crbug.com/652027: Show four and a *half* items in the list. */ 100 /* crbug.com/652027: Show four and a *half* items in the list. */
95 --cr-dialog-body-container: { 101 --cr-dialog-body-container: {
96 max-height: 280px; 102 max-height: 280px;
97 }; 103 };
98 } 104 }
99 } 105 }
100 </style> 106 </style>
101 107
102 <dialog is="cr-dialog" id="dialog" close-text="$i18n{close}" 108 <dialog is="cr-dialog" id="clearBrowsingDataDialog"
103 ignore-popstate> 109 on-close="onClearBrowsingDataDialogClose_"
110 close-text="$i18n{close}" ignore-popstate>
104 <div class="title">$i18n{clearBrowsingData}</div> 111 <div class="title">$i18n{clearBrowsingData}</div>
105 <div class="body"> 112 <div class="body">
106 <div class="row"> 113 <div class="row">
107 $i18n{clearFollowingItemsFrom} 114 $i18n{clearFollowingItemsFrom}
108 <settings-dropdown-menu id="clearFrom" 115 <settings-dropdown-menu id="clearFrom"
109 label="$i18n{clearFollowingItemsFrom}" 116 label="$i18n{clearFollowingItemsFrom}"
110 pref="{{prefs.browser.clear_data.time_period}}" 117 pref="{{prefs.browser.clear_data.time_period}}"
111 menu-options="[[clearFromOptions_]]"> 118 menu-options="[[clearFromOptions_]]">
112 </settings-dropdown-menu> 119 </settings-dropdown-menu>
113 </div> 120 </div>
114 <!-- Note: whether these checkboxes are checked are ignored if deleting 121 <!-- Note: whether these checkboxes are checked are ignored if deleting
115 history is disabled (i.e. supervised users, policy), so it's OK to 122 history is disabled (i.e. supervised users, policy), so it's OK to
116 have a hidden checkbox that's also checked (as the C++ accounts for 123 have a hidden checkbox that's also checked (as the C++ accounts for
117 whether a user is allowed to delete history independently). --> 124 whether a user is allowed to delete history independently). -->
118 <settings-checkbox id="browsingCheckbox" 125 <settings-checkbox id="browsingCheckbox"
119 pref="{{prefs.browser.clear_data.browsing_history}}" 126 pref="{{prefs.browser.clear_data.browsing_history}}"
120 label="$i18n{clearBrowsingHistory}" 127 label="$i18n{clearBrowsingHistory}"
121 sub-label="[[counters_.browsing_history]]" 128 sub-label="[[counters_.browsing_history]]"
122 disabled="[[clearingInProgress_]]" 129 disabled="[[clearingInProgress_]]"
123 hidden="[[isSupervised_]]"> 130 hidden="[[isSupervised_]]">
124 </settings-checkbox> 131 </settings-checkbox>
125 <settings-checkbox id="downloadCheckbox" 132 <settings-checkbox id="downloadCheckbox"
126 pref="{{prefs.browser.clear_data.download_history}}" 133 pref="{{prefs.browser.clear_data.download_history}}"
127 label="$i18n{clearDownloadHistory}" 134 label="$i18n{clearDownloadHistory}"
128 sub-label="[[counters_.download_history]]" 135 sub-label="[[counters_.download_history]]"
129 disabled="[[clearingInProgress_]]" 136 disabled="[[clearingInProgress_]]"
130 hidden="[[isSupervised_]]"> 137 hidden="[[isSupervised_]]">
131 </settings-checkbox> 138 </settings-checkbox>
132 <settings-checkbox 139 <settings-checkbox id="cacheCheckbox"
133 pref="{{prefs.browser.clear_data.cache}}" 140 pref="{{prefs.browser.clear_data.cache}}"
134 label="$i18n{clearCache}" 141 label="$i18n{clearCache}"
135 sub-label="[[counters_.cache]]" 142 sub-label="[[counters_.cache]]"
136 disabled="[[clearingInProgress_]]"> 143 disabled="[[clearingInProgress_]]">
137 </settings-checkbox> 144 </settings-checkbox>
138 <settings-checkbox 145 <settings-checkbox id="cookiesCheckbox"
139 pref="{{prefs.browser.clear_data.cookies}}" 146 pref="{{prefs.browser.clear_data.cookies}}"
140 label="$i18n{clearCookies}" 147 label="$i18n{clearCookies}"
141 sub-label="$i18n{clearCookiesCounter}" 148 sub-label="$i18n{clearCookiesCounter}"
142 disabled="[[clearingInProgress_]]"> 149 disabled="[[clearingInProgress_]]">
143 </settings-checkbox> 150 </settings-checkbox>
144 <settings-checkbox 151 <settings-checkbox
145 pref="{{prefs.browser.clear_data.passwords}}" 152 pref="{{prefs.browser.clear_data.passwords}}"
146 label="$i18n{clearPasswords}" 153 label="$i18n{clearPasswords}"
147 sub-label="[[counters_.passwords]]" 154 sub-label="[[counters_.passwords]]"
148 disabled="[[clearingInProgress_]]"> 155 disabled="[[clearingInProgress_]]">
(...skipping 14 matching lines...) Expand all
163 pref="{{prefs.browser.clear_data.media_licenses}}" 170 pref="{{prefs.browser.clear_data.media_licenses}}"
164 label="$i18n{clearMediaLicenses}" 171 label="$i18n{clearMediaLicenses}"
165 sub-label="[[counters_.media_licenses]]" 172 sub-label="[[counters_.media_licenses]]"
166 disabled="[[clearingInProgress_]]"> 173 disabled="[[clearingInProgress_]]">
167 </settings-checkbox> 174 </settings-checkbox>
168 </div> 175 </div>
169 <div class="button-container"> 176 <div class="button-container">
170 <paper-spinner active="[[clearingInProgress_]]"></paper-spinner> 177 <paper-spinner active="[[clearingInProgress_]]"></paper-spinner>
171 <paper-button class="cancel-button" disabled="[[clearingInProgress_]]" 178 <paper-button class="cancel-button" disabled="[[clearingInProgress_]]"
172 on-tap="onCancelTap_">$i18n{cancel}</paper-button> 179 on-tap="onCancelTap_">$i18n{cancel}</paper-button>
173 <paper-button class="action-button" disabled="[[clearingInProgress_]]" 180 <paper-button id="clearBrowsingDataConfirm"
181 class="action-button" disabled="[[clearingInProgress_]]"
174 on-tap="onClearBrowsingDataTap_"> 182 on-tap="onClearBrowsingDataTap_">
175 $i18n{clearBrowsingData} 183 $i18n{clearBrowsingData}
176 </paper-button> 184 </paper-button>
177 </div> 185 </div>
178 <div class="footer"> 186 <div class="footer">
179 <div id="googleFooter" class="clear-browsing-data-footer"> 187 <div id="googleFooter" class="clear-browsing-data-footer">
180 <iron-icon icon="settings:googleg"></iron-icon> 188 <iron-icon icon="settings:googleg"></iron-icon>
181 <div class="footer-text">$i18nRaw{otherFormsOfBrowsingHistory}</div> 189 <div class="footer-text">$i18nRaw{otherFormsOfBrowsingHistory}</div>
182 </div> 190 </div>
183 <div id="generalFooter" class="clear-browsing-data-footer"> 191 <div id="generalFooter" class="clear-browsing-data-footer">
184 <iron-icon icon="settings:info"></iron-icon> 192 <iron-icon icon="settings:info"></iron-icon>
185 <div class="footer-text"> 193 <div class="footer-text">
186 <span id="syncedDataSentence">$i18n{clearsSyncedData}</span> 194 <span id="syncedDataSentence">$i18n{clearsSyncedData}</span>
187 <span>$i18n{warnAboutNonClearedData}</span> 195 <span>$i18n{warnAboutNonClearedData}</span>
188 <a id="clear-browser-data-old-learn-more-link" 196 <a id="clear-browser-data-old-learn-more-link"
189 href="$i18n{clearBrowsingDataLearnMoreUrl}" 197 href="$i18n{clearBrowsingDataLearnMoreUrl}"
190 target="_blank">$i18n{learnMore}</a> 198 target="_blank">$i18n{learnMore}</a>
191 </div> 199 </div>
192 </div> 200 </div>
193 </div> 201 </div>
194 </dialog> 202 </dialog>
195 203
204 <template is="dom-if" if="[[showImportantSitesDialog_]]">
205 <dialog is="cr-dialog" id="importantSitesDialog" close-text="$i18n{close}"
206 show-scroll-borders ignore-popstate>
207 <div class="title">
208 $i18n{clearBrowsingData}
209 <div class="secondary">
210 $i18n{importantSitesSubtitle}
211 </div>
212 </div>
213 <div class="body">
214 <template is="dom-repeat" items="[[importantSites_]]">
215 <div class="row">
216 <important-site-checkbox
217 site="[[item]]"
218 disabled="[[clearingInProgress_]]">
219 </important-site-checkbox>
220 </div>
221 </template>
222 </div>
223 <div class="button-container">
224 <paper-spinner active="[[clearingInProgress_]]"></paper-spinner>
225 <paper-button class="cancel-button" disabled="[[clearingInProgress_]]"
226 on-tap="onImportantSitesCancelTap_">$i18n{cancel}</paper-button>
227 <paper-button id="importantSitesConfirm"
228 class="action-button" disabled="[[clearingInProgress_]]"
229 on-tap="onImportantSitesConfirmTap_">
230 $i18n{importantSitesConfirm}
Dan Beam 2017/05/16 19:46:09 indent off (should be 2 spaces less)
dullweber 2017/05/17 09:57:37 Done.
231 </paper-button>
232 </div>
233 </dialog>
234 </template>
235
196 <template is="dom-if" if="[[showHistoryDeletionDialog_]]" restamp> 236 <template is="dom-if" if="[[showHistoryDeletionDialog_]]" restamp>
197 <settings-history-deletion-dialog id="notice" 237 <settings-history-deletion-dialog id="notice"
198 on-close="onHistoryDeletionDialogClose_"> 238 on-close="onHistoryDeletionDialogClose_">
199 </settings-history-deletion-dialog> 239 </settings-history-deletion-dialog>
200 </template> 240 </template>
201 </template> 241 </template>
202 <script src="clear_browsing_data_dialog.js"></script> 242 <script src="clear_browsing_data_dialog.js"></script>
203 </dom-module> 243 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698