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

Unified 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: rebase Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
index fed8c2db992397ad7e5b86e29c41376b05f286e4..2855f84043e73fbc6fb03c8c1a7194e83a4e578e 100644
--- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
+++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
@@ -6,6 +6,7 @@
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="clear_browsing_data_browser_proxy.html">
<link rel="import" href="history_deletion_dialog.html">
+<link rel="import" href="../controls/important_site_checkbox.html">
<link rel="import" href="../controls/settings_checkbox.html">
<link rel="import" href="../controls/settings_dropdown_menu.html">
<link rel="import" href="../icons.html">
@@ -79,6 +80,11 @@
-webkit-margin-start: 0.5em;
}
+ .title .secondary {
+ font-size: 86.67%; /* (13px / 15px) * 100 */
dschuyler 2017/04/11 23:49:32 nit: two spaces between the ; and the /*
dullweber 2017/04/13 14:47:49 Done.
+ padding-top: 8px;
+ }
+
/* Cap the height on smaller screens to avoid unfavorable clipping.
* Replace the bottom margin with padding to avoid the gap between
* the scrollbar and the bottom separator. */
@@ -86,7 +92,7 @@
#dialog {
/* crbug.com/652027: Show four and a *half* items in the list. */
--cr-dialog-body-container: {
- max-height: 280px;
+ max-height: 280px;
};
}
}
@@ -94,8 +100,14 @@
<dialog is="cr-dialog" id="dialog" close-text="$i18n{close}"
show-scroll-borders ignore-popstate>
- <div class="title">$i18n{clearBrowsingData}</div>
- <div class="body">
+ <div class="title">
+ $i18n{clearBrowsingData}
+ <div class="secondary"
+ hidden$="[[!isImportantSitesDialog_(dialogState_)]]">
+ $i18n{importantSitesSubtitle}
+ </div>
+ </div>
+ <div class="body" hidden$="[[!isClearBrowsingDataDialog_(dialogState_)]]">
dschuyler 2017/04/11 23:49:32 This looks like it is changing quite a bit of the
dullweber 2017/04/13 14:47:49 I build the dialog similar to the bluetooth_device
<div class="row">
$i18n{clearFollowingItemsFrom}
<settings-dropdown-menu id="clearFrom"
@@ -115,13 +127,13 @@
sub-label="[[counters_.download_history]]"
disabled="[[clearingInProgress_]]">
</settings-checkbox>
- <settings-checkbox
+ <settings-checkbox id="cacheCheckbox"
pref="{{prefs.browser.clear_data.cache}}"
label="$i18n{clearCache}"
sub-label="[[counters_.cache]]"
disabled="[[clearingInProgress_]]">
</settings-checkbox>
- <settings-checkbox
+ <settings-checkbox id="cookiesCheckbox"
pref="{{prefs.browser.clear_data.cookies}}"
label="$i18n{clearCookies}"
sub-label="$i18n{clearCookiesCounter}"
@@ -152,16 +164,35 @@
disabled="[[clearingInProgress_]]">
</settings-checkbox>
</div>
+ <template is="dom-if" if="[[isImportantSitesDialog_(dialogState_)]]">
+ <div class="body">
+ <template is="dom-repeat" items="[[importantSites_]]">
+ <div class="row">
+ <important-site-checkbox
+ site="[[item]]"
+ disabled="[[clearingInProgress_]]">
+ </important-site-checkbox>
+ </div>
+ </template>
+ </div>
+ </template>
<div class="button-container">
<paper-spinner active="[[clearingInProgress_]]"></paper-spinner>
<paper-button class="cancel-button" disabled="[[clearingInProgress_]]"
on-tap="onCancelTap_">$i18n{cancel}</paper-button>
<paper-button class="action-button" disabled="[[clearingInProgress_]]"
on-tap="onClearBrowsingDataTap_">
- $i18n{clearBrowsingData}
+ <template is="dom-if"
+ if="[[isClearBrowsingDataDialog_(dialogState_)]]">
+ $i18n{clearBrowsingData}
+ </template>
+ <template is="dom-if" if="[[isImportantSitesDialog_(dialogState_)]]">
+ $i18n{importantSitesConfirm}
+ </template>
</paper-button>
</div>
- <div class="footer">
+ <div class="footer"
+ hidden$="[[!isClearBrowsingDataDialog_(dialogState_)]]">
<div id="googleFooter" class="clear-browsing-data-footer">
<iron-icon icon="settings:googleg"></iron-icon>
<div class="footer-text">$i18nRaw{otherFormsOfBrowsingHistory}</div>

Powered by Google App Engine
This is Rietveld 408576698