summaryrefslogtreecommitdiff
path: root/chromium/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html')
-rw-r--r--chromium/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html54
1 files changed, 51 insertions, 3 deletions
diff --git a/chromium/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html b/chromium/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
index 48df5d399b4..ba93834005d 100644
--- a/chromium/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
+++ b/chromium/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
@@ -2,6 +2,7 @@
<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
<link rel="import" href="chrome://resources/cr_elements/paper_tabs_style_css.html">
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
@@ -46,6 +47,12 @@
padding-top: 8px;
}
+ #clearBrowsingDataDialog [slot=footer] {
+ background: var(--paper-grey-50);
+ border-top: none;
+ padding: 0;
+ }
+
.row {
align-items: center;
display: flex;
@@ -53,8 +60,8 @@
}
paper-spinner-lite {
- -webkit-margin-end: 16px;
margin-bottom: auto;
+ margin-inline-end: 16px;
margin-top: auto;
}
@@ -81,13 +88,23 @@
}
.time-range-select {
- -webkit-margin-start: 12px;
+ margin-inline-start: 12px;
}
[slot=title] .secondary {
font-size: calc(13 / 15 * 100%);
padding-top: 8px;
}
+
+ .divider {
+ border-top: var(--settings-separator-line);
+ margin: 0 16px;
+ }
+
+ #footer-description {
+ color: var(--cr-secondary-text-color);
+ padding: 16px;
+ }
</style>
<cr-dialog id="clearBrowsingDataDialog"
@@ -127,7 +144,7 @@
pref="{{prefs.browser.clear_data.browsing_history_basic}}"
label="$i18n{clearBrowsingHistory}"
sub-label-html="[[browsingCheckboxLabel_(
- isSignedIn_, isSyncingHistory_,
+ isSignedIn_, isSyncingHistory_, syncStatus.hasError,
'$i18nPolymer{clearBrowsingHistorySummary}',
'$i18nPolymer{clearBrowsingHistorySummarySignedIn}',
'$i18nPolymer{clearBrowsingHistorySummarySynced}')]]"
@@ -239,6 +256,37 @@
$i18n{clearData}
</paper-button>
</div>
+ <div slot="footer"
+ hidden="[[!shouldShowFooter_(syncStatus.signedIn, diceEnabled_)]]">
+ <settings-sync-account-control sync-status="[[syncStatus]]"
+ hide-buttons>
+ </settings-sync-account-control>
+ <div class="divider"></div>
+ <div id="footer-description" on-tap="onSyncDescriptionLinkClicked_">
+ <template is="dom-if" if="[[!syncStatus.hasError]]">
+ <span id="sync-info">
+ $i18nRaw{clearBrowsingDataWithSync}
+ </span>
+ </template>
+ <template is="dom-if" if="[[syncStatus.hasError]]">
+ <template is="dom-if" if="[[isSyncPaused_]]">
+ <span id="sync-paused-info">
+ $i18nRaw{clearBrowsingDataWithSyncPaused}
+ </span>
+ </template>
+ <template is="dom-if" if="[[hasPassphraseError_]]">
+ <span id="sync-passphrase-error-info">
+ $i18nRaw{clearBrowsingDataWithSyncPassphraseError}
+ </span>
+ </template>
+ <template is="dom-if" if="[[hasOtherSyncError_]]">
+ <span id="sync-other-error-info">
+ $i18nRaw{clearBrowsingDataWithSyncError}
+ </span>
+ </template>
+ </template>
+ </div>
+ </div>
</cr-dialog>
<template is="dom-if" if="[[showHistoryDeletionDialog_]]" restamp>