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

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

Issue 2626993003: MD Settings: add borders between toggle rows on basic/advanced pages (Closed)
Patch Set: axe flex-layout Created 3 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/system_page/system_page.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html"> 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html"> 8 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html">
9 <link rel="import" href="/controls/settings_toggle_button.html"> 9 <link rel="import" href="/controls/settings_toggle_button.html">
10 <link rel="import" href="/lifetime_browser_proxy.html"> 10 <link rel="import" href="/lifetime_browser_proxy.html">
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 -webkit-margin-start: var(--checkbox-spacing); 51 -webkit-margin-start: var(--checkbox-spacing);
52 } 52 }
53 </style> 53 </style>
54 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> 54 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp>
55 <settings-clear-browsing-data-dialog prefs="{{prefs}}" 55 <settings-clear-browsing-data-dialog prefs="{{prefs}}"
56 on-close="onDialogClosed_"> 56 on-close="onDialogClosed_">
57 </settings-clear-browsing-data-dialog> 57 </settings-clear-browsing-data-dialog>
58 </template> 58 </template>
59 <settings-animated-pages id="pages" section="privacy"> 59 <settings-animated-pages id="pages" section="privacy">
60 <neon-animatable route-path="default"> 60 <neon-animatable route-path="default">
61 <div class="settings-box block first"> 61 <div class="settings-box first">
62 <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p> 62 <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p>
63 <settings-toggle-button 63 </div>
64 <div class="settings-box">
65 <settings-toggle-button class="start"
64 pref="{{prefs.alternate_error_pages.enabled}}" 66 pref="{{prefs.alternate_error_pages.enabled}}"
65 label="$i18n{linkDoctorPref}"> 67 label="$i18n{linkDoctorPref}">
66 </settings-toggle-button> 68 </settings-toggle-button>
67 <settings-toggle-button 69 </div>
70 <div class="settings-box">
71 <settings-toggle-button class="start"
68 pref="{{prefs.search.suggest_enabled}}" 72 pref="{{prefs.search.suggest_enabled}}"
69 label="$i18n{searchSuggestPref}" 73 label="$i18n{searchSuggestPref}"
70 hidden="[[!pageVisibility.searchPrediction]]"> 74 hidden="[[!pageVisibility.searchPrediction]]">
71 </settings-toggle-button> 75 </settings-toggle-button>
72 <settings-toggle-button 76 </div>
77 <div class="settings-box">
78 <settings-toggle-button class="start"
73 pref="{{prefs.net.network_prediction_options}}" 79 pref="{{prefs.net.network_prediction_options}}"
74 label="$i18n{networkPredictionEnabled}" 80 label="$i18n{networkPredictionEnabled}"
75 hidden="[[!pageVisibility.networkPrediction]]"> 81 hidden="[[!pageVisibility.networkPrediction]]">
76 </settings-toggle-button> 82 </settings-toggle-button>
77 <div class="layout horizontal center settings-row-min-height"> 83 </div>
78 <div class="flex">$i18n{safeBrowsingEnableExtendedReporting}</div> 84 <div class="settings-box">
79 <paper-toggle-button id="safeBrowsingExtendedReportingControl" 85 <div class="start">$i18n{safeBrowsingEnableExtendedReporting}</div>
80 on-tap="onSafeBrowsingExtendedReportingControlTap_" 86 <paper-toggle-button id="safeBrowsingExtendedReportingControl"
81 checked="[[safeBrowsingExtendedReportingEnabled_]]"> 87 on-tap="onSafeBrowsingExtendedReportingControlTap_"
82 </paper-toggle-button> 88 checked="[[safeBrowsingExtendedReportingEnabled_]]">
83 </div> 89 </paper-toggle-button>
84 <settings-toggle-button 90 </div>
91 <div class="settings-box">
92 <settings-toggle-button class="start"
85 pref="{{prefs.safebrowsing.enabled}}" 93 pref="{{prefs.safebrowsing.enabled}}"
86 label="$i18n{safeBrowsingEnableProtection}"> 94 label="$i18n{safeBrowsingEnableProtection}">
87 </settings-toggle-button> 95 </settings-toggle-button>
96 </div>
88 <if expr="_google_chrome"> 97 <if expr="_google_chrome">
89 <if expr="chromeos"> 98 <if expr="chromeos">
90 <settings-toggle-button 99 <div class="settings-box">
100 <settings-toggle-button class="start"
91 pref="{{prefs.cros.metrics.reportingEnabled}}" 101 pref="{{prefs.cros.metrics.reportingEnabled}}"
92 label="$i18n{enableLogging}"> 102 label="$i18n{enableLogging}">
93 </settings-toggle-button> 103 </settings-toggle-button>
104 </div>
94 </if><!-- chromeos --> 105 </if><!-- chromeos -->
95 <if expr="not chromeos"> 106 <if expr="not chromeos">
96 <div class="layout horizontal center settings-row-min-height"> 107 <div class="settings-box">
97 <div class="flex">$i18n{enableLogging}</div> 108 <div class="start">$i18n{enableLogging}</div>
98 <template is="dom-if" if="[[showRestart_]]" restamp> 109 <template is="dom-if" if="[[showRestart_]]" restamp>
99 <paper-button on-tap="onRestartTap_" id="restart"> 110 <paper-button on-tap="onRestartTap_" id="restart">
100 $i18n{restart} 111 $i18n{restart}
101 </paper-button> 112 </paper-button>
102 </template> 113 </template>
103 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> 114 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp>
104 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> 115 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon>
105 <paper-tooltip for="indicator" position="top" 116 <paper-tooltip for="indicator" position="top"
106 fit-to-visible-bounds> 117 fit-to-visible-bounds>
107 $i18n{controlledSettingPolicy} 118 $i18n{controlledSettingPolicy}
108 </paper-tooltip> 119 </paper-tooltip>
109 </template> 120 </template>
110 <paper-toggle-button id="metricsReportingControl" 121 <paper-toggle-button id="metricsReportingControl"
111 on-tap="onMetricsReportingControlTap_" 122 on-tap="onMetricsReportingControlTap_"
112 checked="[[metricsReporting_.enabled]]" 123 checked="[[metricsReporting_.enabled]]"
113 disabled="[[metricsReporting_.managed]]"> 124 disabled="[[metricsReporting_.managed]]">
114 </paper-toggle-button> 125 </paper-toggle-button>
115 </div> 126 </div>
116 </if><!-- not chromeos --> 127 </if><!-- not chromeos -->
117 </if><!-- _google_chrome --> 128 </if><!-- _google_chrome -->
118 <settings-toggle-button 129 <div class="settings-box">
130 <settings-toggle-button class="start"
119 pref="{{prefs.enable_do_not_track}}" 131 pref="{{prefs.enable_do_not_track}}"
120 label="$i18n{doNotTrack}"> 132 label="$i18n{doNotTrack}">
121 </settings-toggle-button> 133 </settings-toggle-button>
134 </div>
122 <if expr="chromeos"> 135 <if expr="chromeos">
123 <settings-toggle-button 136 <div class="settings-box">
137 <settings-toggle-button class="start"
124 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}" 138 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}"
125 label="$i18n{enableContentProtectionAttestation}"> 139 label="$i18n{enableContentProtectionAttestation}">
126 </settings-toggle-button> 140 </settings-toggle-button>
127 <settings-toggle-button 141 </div>
142 <div class="settings-box">
143 <settings-toggle-button class="start"
128 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" 144 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}"
129 label="$i18n{wakeOnWifi}"> 145 label="$i18n{wakeOnWifi}">
130 </settings-toggle-button> 146 </settings-toggle-button>
147 </div>
131 </if> 148 </if>
132 </div>
133 <if expr="_google_chrome"> 149 <if expr="_google_chrome">
134 <div class="settings-box two-line"> 150 <div class="settings-box two-line">
135 <settings-toggle-button class="start" 151 <settings-toggle-button class="start"
136 pref="{{prefs.spellcheck.use_spelling_service}}" 152 pref="{{prefs.spellcheck.use_spelling_service}}"
137 label="$i18n{spellingPref}" 153 label="$i18n{spellingPref}"
138 sub-label="$i18n{spellingDescription}"> 154 sub-label="$i18n{spellingDescription}">
139 </settings-toggle-button> 155 </settings-toggle-button>
140 </div> 156 </div>
141 </if> 157 </if>
142 <if expr="use_nss_certs or is_win or is_macosx"> 158 <if expr="use_nss_certs or is_win or is_macosx">
143 <div id="manageCertificates" class="settings-box two-line" 159 <div id="manageCertificates" class="settings-box two-line"
144 actionable on-tap="onManageCertificatesTap_"> 160 actionable on-tap="onManageCertificatesTap_">
145 <div class="start"> 161 <div class="start">
146 <div>$i18n{manageCertificates}</div> 162 $i18n{manageCertificates}
147 <div class="secondary">$i18n{manageCertificatesDescription}</div> 163 <div class="secondary">$i18n{manageCertificatesDescription}</div>
148 </div> 164 </div>
149 <if expr="use_nss_certs"> 165 <if expr="use_nss_certs">
150 <button is="paper-icon-button-light" class="subpage-arrow"></button> 166 <button is="paper-icon-button-light" class="subpage-arrow"></button>
151 </if> 167 </if>
152 <if expr="not use_nss_certs"> 168 <if expr="not use_nss_certs">
153 <button is="paper-icon-button-light" class="icon-external"></button> 169 <button is="paper-icon-button-light" class="icon-external"></button>
154 </if> 170 </if>
155 </div> 171 </div>
156 </if> 172 </if>
157 <div id="site-settings-subpage-trigger" 173 <div id="site-settings-subpage-trigger"
158 class="settings-box two-line" actionable 174 class="settings-box two-line" actionable
159 on-tap="onSiteSettingsTap_"> 175 on-tap="onSiteSettingsTap_">
160 <div class="start"> 176 <div class="start">
161 <div>[[siteSettingsPageTitle_()]]</div> 177 [[siteSettingsPageTitle_()]]
162 <div class="secondary">$i18n{siteSettingsDescription}</div> 178 <div class="secondary">$i18n{siteSettingsDescription}</div>
163 </div> 179 </div>
164 <button class="subpage-arrow" is="paper-icon-button-light"></button> 180 <button class="subpage-arrow" is="paper-icon-button-light"></button>
165 </div> 181 </div>
166 <div class="settings-box two-line" id="clearBrowsingData" 182 <div class="settings-box two-line" id="clearBrowsingData"
167 on-tap="onClearBrowsingDataTap_" actionable> 183 on-tap="onClearBrowsingDataTap_" actionable>
168 <div class="start"> 184 <div class="start">
169 $i18n{clearBrowsingData} 185 $i18n{clearBrowsingData}
170 <div class="secondary">$i18n{clearBrowsingDataDescription}</div> 186 <div class="secondary">$i18n{clearBrowsingDataDescription}</div>
171 </div> 187 </div>
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 $i18n{siteSettingsCookieRemoveAll} 401 $i18n{siteSettingsCookieRemoveAll}
386 </paper-button> 402 </paper-button>
387 <site-data-details-subpage page-title="{{pageTitle}}"> 403 <site-data-details-subpage page-title="{{pageTitle}}">
388 </site-data-details-subpage> 404 </site-data-details-subpage>
389 </settings-subpage> 405 </settings-subpage>
390 </template> 406 </template>
391 </settings-animated-pages> 407 </settings-animated-pages>
392 </template> 408 </template>
393 <script src="privacy_page.js"></script> 409 <script src="privacy_page.js"></script>
394 </dom-module> 410 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/system_page/system_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698