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

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

Issue 1652553002: [MD settings] adjusting heights of settings rows; removing two .css files; unifying settings layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge with master Created 4 years, 10 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://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item-b ody.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item-b ody.html">
7 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.html"> 7 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.html">
8 <link rel="import" href="chrome://md-settings/clear_browsing_data_page/clear_bro wsing_data_page.html"> 8 <link rel="import" href="chrome://md-settings/clear_browsing_data_page/clear_bro wsing_data_page.html">
9 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> 9 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">
10 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 10 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
11 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> 11 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">
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" 16 <link rel="import" type="css"
17 href="chrome://md-settings/settings_shared.css"> 17 href="chrome://md-settings/settings_shared.css">
18 <link rel="import" type="css" href="privacy_page.css"> 18 <link rel="import" type="css" href="privacy_page.css">
19 <template> 19 <template>
20 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 20 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
21 section="privacy"> 21 section="privacy">
22 <neon-animatable id="main"> 22 <neon-animatable id="main">
23 <div class="settings-box first"> 23 <div class="settings-box block first">
24 <p class="privacy-explanation" 24 <p class="privacy-explanation"
25 i18n-values=".innerHTML:improveBrowsingExperience"> 25 i18n-values=".innerHTML:improveBrowsingExperience">
26 </p> 26 </p>
27 <settings-checkbox 27 <settings-checkbox
28 pref="{{prefs.alternate_error_pages.enabled}}" 28 pref="{{prefs.alternate_error_pages.enabled}}"
29 i18n-values="label:linkDoctorPref"> 29 i18n-values="label:linkDoctorPref">
30 </settings-checkbox> 30 </settings-checkbox>
31 <settings-checkbox 31 <settings-checkbox
32 pref="{{prefs.search.suggest_enabled}}" 32 pref="{{prefs.search.suggest_enabled}}"
33 i18n-values="label:searchSuggestPref"> 33 i18n-values="label:searchSuggestPref">
(...skipping 29 matching lines...) Expand all
63 <settings-checkbox 63 <settings-checkbox
64 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}" 64 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}"
65 i18n-values="label:enableContentProtectionAttestation"> 65 i18n-values="label:enableContentProtectionAttestation">
66 </settings-checkbox> 66 </settings-checkbox>
67 <settings-checkbox 67 <settings-checkbox
68 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" 68 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}"
69 i18n-values="label:wakeOnWifi"> 69 i18n-values="label:wakeOnWifi">
70 </settings-checkbox> 70 </settings-checkbox>
71 </if> 71 </if>
72 </div> 72 </div>
73 <div class="settings-box" on-tap="onManageCertificatesTap_"> 73 <div class="settings-box two-line" on-tap="onManageCertificatesTap_">
74 <div class="start"> 74 <div class="start">
75 <div i18n-content="manageCertificates"></div> 75 <div i18n-content="manageCertificates"></div>
76 <div class="secondary"> 76 <div class="secondary">
77 <!-- TODO(dschuyler) replace this placeholder text --> 77 <!-- TODO(dschuyler) replace this placeholder text -->
78 Contrary to popular belief, Lorem Ipsum is not simply random text. 78 Contrary to popular belief, Lorem Ipsum is not simply random text.
79 </div> 79 </div>
80 </div> 80 </div>
81 </div> 81 </div>
82 <div class="settings-box" on-tap="onSiteSettingsTap_"> 82 <div class="settings-box two-line" on-tap="onSiteSettingsTap_">
83 <div class="start"> 83 <div class="start">
84 <div i18n-content="siteSettings"></div> 84 <div i18n-content="siteSettings"></div>
85 <div class="secondary"> 85 <div class="secondary">
86 <!-- TODO(dschuyler) replace this placeholder text --> 86 <!-- TODO(dschuyler) replace this placeholder text -->
87 Contrary to popular belief, Lorem Ipsum is not simply random text. 87 Contrary to popular belief, Lorem Ipsum is not simply random text.
88 </div> 88 </div>
89 </div> 89 </div>
90 </div> 90 </div>
91 <div class="settings-box"> 91 <div class="settings-box">
92 <paper-button on-tap="onClearBrowsingDataTap_" 92 <paper-button on-tap="onClearBrowsingDataTap_"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 <neon-animatable id="clear-browsing-data"> 197 <neon-animatable id="clear-browsing-data">
198 <settings-subheader i18n-values="page-title:clearBrowsingData"> 198 <settings-subheader i18n-values="page-title:clearBrowsingData">
199 </settings-subheader> 199 </settings-subheader>
200 <settings-clear-browsing-data-page prefs="{{prefs}}"> 200 <settings-clear-browsing-data-page prefs="{{prefs}}">
201 </settings-clear-browsing-data-page> 201 </settings-clear-browsing-data-page>
202 </neon-animatable> 202 </neon-animatable>
203 </settings-animated-pages> 203 </settings-animated-pages>
204 </template> 204 </template>
205 <script src="privacy_page.js"></script> 205 <script src="privacy_page.js"></script>
206 </dom-module> 206 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698