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

Unified Diff: chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html

Issue 2098633002: Migrate the one-time notice into the MD settings CBD dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_counters
Patch Set: Created 4 years, 6 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 e5d1268ea3ee007cf9eaa671fbcf4b949d291128..e4a5c90121b5f6f67685c26e413a82050ece72db 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
@@ -5,6 +5,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner.html">
<link rel="import" href="/i18n_setup.html">
<link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.html">
+<link rel="import" href="/clear_browsing_data_dialog/other_forms_of_browsing_history_notice.html">
<link rel="import" href="/controls/settings_checkbox.html">
<link rel="import" href="/controls/settings_dropdown_menu.html">
<link rel="import" href="/icons.html">
@@ -86,7 +87,10 @@
}
</style>
- <cr-dialog id="dialog">
+ <!-- #notice correctly places its own backdrop above #dialog and under
+ itself, so when it is shown, #dialog should not use backdrop. -->
+ <cr-dialog id="dialog"
+ with-backdrop="[[!showOtherFormsOfBrowsingHistoryNotice_]]">
dschuyler 2016/06/25 01:34:54 The length of the names, such as showOtherFormsOf
msramek 2016/06/27 15:24:59 Done. I have been struggling with this since the
<div class="title">$i18n{clearBrowsingData}</div>
<div class="body">
<div class="row">
@@ -163,6 +167,13 @@
</div>
</div>
</cr-dialog>
+
+ <template is="dom-if" if="[[showOtherFormsOfBrowsingHistoryNotice_]]"
+ restamp>
+ <settings-other-forms-of-browsing-history-notice id="notice"
+ on-closed="onOtherFormsOfBrowsingHistoryNoticeClose_">
+ </settings-other-forms-of-browsing-history-notice>
+ </template>
</template>
<script src="clear_browsing_data_dialog.js"></script>
</dom-module>

Powered by Google App Engine
This is Rietveld 408576698