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

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

Issue 1750873002: [MD settings] change ClearBrowsingData from a sub-page to a dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed to settings-dialog Created 4 years, 9 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/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.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://md-settings/certificate_manager_page/certifica te_manager_page.html"> 5 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.html">
6 <link rel="import" href="chrome://md-settings/clear_browsing_data_page/clear_bro wsing_data_page.html"> 6 <link rel="import" href="chrome://md-settings/clear_browsing_data_page/clear_bro wsing_data_page.html">
7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> 7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">
8 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 8 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
9 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> 9 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">
10 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> 10 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
11 <link rel="import" href="chrome://md-settings/site_settings/all_sites.html"> 11 <link rel="import" href="chrome://md-settings/site_settings/all_sites.html">
12 <link rel="import" href="chrome://md-settings/site_settings/constants.html"> 12 <link rel="import" href="chrome://md-settings/site_settings/constants.html">
13 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_p age.html"> 13 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_p age.html">
14 14
15 <dom-module id="settings-privacy-page"> 15 <dom-module id="settings-privacy-page">
16 <link rel="import" type="css" href="privacy_page.css"> 16 <link rel="import" type="css" href="privacy_page.css">
17 <template> 17 <template>
18 <style include="settings-shared"></style> 18 <style include="settings-shared"></style>
19 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 19 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
20 section="privacy"> 20 section="privacy">
21 <neon-animatable id="main"> 21 <neon-animatable id="main">
22 <settings-clear-browsing-data-page prefs="{{prefs}}">
dpapad 2016/03/09 20:13:24 From a performance standpoint this dialog is alway
dschuyler 2016/03/09 22:15:16 Let's do the separate CL.
23 </settings-clear-browsing-data-page>
22 <div class="settings-box block first"> 24 <div class="settings-box block first">
23 <p class="privacy-explanation" 25 <p class="privacy-explanation"
24 i18n-values=".innerHTML:improveBrowsingExperience"> 26 i18n-values=".innerHTML:improveBrowsingExperience">
25 </p> 27 </p>
26 <settings-checkbox 28 <settings-checkbox
27 pref="{{prefs.alternate_error_pages.enabled}}" 29 pref="{{prefs.alternate_error_pages.enabled}}"
28 i18n-values="label:linkDoctorPref"> 30 i18n-values="label:linkDoctorPref">
29 </settings-checkbox> 31 </settings-checkbox>
30 <settings-checkbox 32 <settings-checkbox
31 pref="{{prefs.search.suggest_enabled}}" 33 pref="{{prefs.search.suggest_enabled}}"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 category="{{ContentSettingsTypes.POPUPS}}"> 206 category="{{ContentSettingsTypes.POPUPS}}">
205 </site-settings-category> 207 </site-settings-category>
206 </neon-animatable> 208 </neon-animatable>
207 209
208 <neon-animatable id="site-details"> 210 <neon-animatable id="site-details">
209 <site-details prefs="{{prefs}}" origin="{{originSelected}}" 211 <site-details prefs="{{prefs}}" origin="{{originSelected}}"
210 current-route="{{currentRoute}}" 212 current-route="{{currentRoute}}"
211 category-selected="{{categorySelected}}"> 213 category-selected="{{categorySelected}}">
212 </site-details> 214 </site-details>
213 </neon-animatable> 215 </neon-animatable>
214 <neon-animatable id="clear-browsing-data">
215 <settings-subheader i18n-values="page-title:clearBrowsingData">
216 </settings-subheader>
217 <settings-clear-browsing-data-page prefs="{{prefs}}">
218 </settings-clear-browsing-data-page>
219 </neon-animatable>
220 </settings-animated-pages> 216 </settings-animated-pages>
221 </template> 217 </template>
222 <script src="privacy_page.js"></script> 218 <script src="privacy_page.js"></script>
223 </dom-module> 219 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698