| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs
s.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs
s.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.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-icon-button/paper
-icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 7 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog.
html"> | 7 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog.
html"> |
| 8 <link rel="import" href="/controls/settings_checkbox.html"> | 8 <link rel="import" href="/controls/settings_checkbox.html"> |
| 9 <link rel="import" href="/route.html"> | 9 <link rel="import" href="/route.html"> |
| 10 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 10 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 <link rel="import" href="/site_settings_page/site_settings_page.html"> | 21 <link rel="import" href="/site_settings_page/site_settings_page.html"> |
| 22 | 22 |
| 23 <if expr="use_nss_certs"> | 23 <if expr="use_nss_certs"> |
| 24 <link rel="import" href="/certificate_manager_page/certificate_manager_page.html
"> | 24 <link rel="import" href="/certificate_manager_page/certificate_manager_page.html
"> |
| 25 </if> | 25 </if> |
| 26 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html"> | 26 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html"> |
| 27 | 27 |
| 28 <dom-module id="settings-privacy-page"> | 28 <dom-module id="settings-privacy-page"> |
| 29 <template> | 29 <template> |
| 30 <style include="settings-shared"> | 30 <style include="settings-shared"> |
| 31 button[is='paper-icon-button-light'].icon-help { |
| 32 background-image: url(../images/help_outline.svg); |
| 33 } |
| 34 |
| 31 /* TODO(dbeam): this is similar to a 1 line checkbox. Worth somehow | 35 /* TODO(dbeam): this is similar to a 1 line checkbox. Worth somehow |
| 32 * combining? */ | 36 * combining? */ |
| 33 #metricsReporting { | 37 #metricsReporting { |
| 34 align-items: center; | 38 align-items: center; |
| 35 display: flex; | 39 display: flex; |
| 36 min-height: var(--settings-row-min-height); | 40 min-height: var(--settings-row-min-height); |
| 37 } | 41 } |
| 38 | 42 |
| 39 #metricsReportingCheckbox { | 43 #metricsReportingCheckbox { |
| 40 display: inline-block; | 44 display: inline-block; |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 </template> | 183 </template> |
| 180 | 184 |
| 181 <template is="dom-if" route-path="/siteSettings/all" no-search> | 185 <template is="dom-if" route-path="/siteSettings/all" no-search> |
| 182 <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}"> | 186 <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}"> |
| 183 <all-sites selected-site="{{selectedSite}}"></all-sites> | 187 <all-sites selected-site="{{selectedSite}}"></all-sites> |
| 184 </settings-subpage> | 188 </settings-subpage> |
| 185 </template> | 189 </template> |
| 186 <template is="dom-if" route-path="/siteSettings/automaticDownloads" | 190 <template is="dom-if" route-path="/siteSettings/automaticDownloads" |
| 187 no-search> | 191 no-search> |
| 188 <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}"> | 192 <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}"> |
| 193 <button class="icon-help subpage-title-extra" |
| 194 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 189 <site-settings-category | 195 <site-settings-category |
| 190 selected-site="{{selectedSite}}" | 196 selected-site="{{selectedSite}}" |
| 191 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}"> | 197 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}"> |
| 192 </site-settings-category> | 198 </site-settings-category> |
| 193 </settings-subpage> | 199 </settings-subpage> |
| 194 </template> | 200 </template> |
| 195 <template is="dom-if" route-path="/siteSettings/backgroundSync" no-search> | 201 <template is="dom-if" route-path="/siteSettings/backgroundSync" no-search> |
| 196 no-search> | 202 no-search> |
| 197 <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"> | 203 <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"> |
| 204 <button class="icon-help subpage-title-extra" |
| 205 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 198 <site-settings-category | 206 <site-settings-category |
| 199 selected-site="{{selectedSite}}" | 207 selected-site="{{selectedSite}}" |
| 200 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> | 208 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> |
| 201 </site-settings-category> | 209 </site-settings-category> |
| 202 </settings-subpage> | 210 </settings-subpage> |
| 203 </template> | 211 </template> |
| 204 <template is="dom-if" route-path="/siteSettings/camera" no-search> | 212 <template is="dom-if" route-path="/siteSettings/camera" no-search> |
| 205 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> | 213 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> |
| 214 <button class="icon-help subpage-title-extra" |
| 215 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 206 <site-settings-category | 216 <site-settings-category |
| 207 selected-site="{{selectedSite}}" | 217 selected-site="{{selectedSite}}" |
| 208 category="{{ContentSettingsTypes.CAMERA}}"> | 218 category="{{ContentSettingsTypes.CAMERA}}"> |
| 209 <media-picker type="camera" class="media-picker"></media-picker> | 219 <media-picker type="camera" class="media-picker"></media-picker> |
| 210 </site-settings-category> | 220 </site-settings-category> |
| 211 </settings-subpage> | 221 </settings-subpage> |
| 212 </template> | 222 </template> |
| 213 <template is="dom-if" route-path="/siteSettings/cookies" no-search> | 223 <template is="dom-if" route-path="/siteSettings/cookies" no-search> |
| 214 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}"> | 224 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}"> |
| 225 <button class="icon-help subpage-title-extra" |
| 226 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 215 <site-settings-category | 227 <site-settings-category |
| 216 selected-site="{{selectedSite}}" | 228 selected-site="{{selectedSite}}" |
| 217 category="{{ContentSettingsTypes.COOKIES}}"> | 229 category="{{ContentSettingsTypes.COOKIES}}"> |
| 218 <div class="settings-box cookie-controls"> | 230 <div class="settings-box cookie-controls"> |
| 219 <settings-checkbox class="start" | 231 <settings-checkbox class="start" |
| 220 label="$i18n{thirdPartyCookie}" | 232 label="$i18n{thirdPartyCookie}" |
| 221 sub-label="$i18n{thirdPartyCookieSublabel}" | 233 sub-label="$i18n{thirdPartyCookieSublabel}" |
| 222 pref="{{prefs.profile.block_third_party_cookies}}"> | 234 pref="{{prefs.profile.block_third_party_cookies}}"> |
| 223 </settings-checkbox> | 235 </settings-checkbox> |
| 224 </div> | 236 </div> |
| 225 <site-data class="site-data"></site-data> | 237 <site-data class="site-data"></site-data> |
| 226 </site-settings-category> | 238 </site-settings-category> |
| 227 </settings-subpage> | 239 </settings-subpage> |
| 228 </template> | 240 </template> |
| 229 <template is="dom-if" route-path="/siteSettings/images" no-search> | 241 <template is="dom-if" route-path="/siteSettings/images" no-search> |
| 230 <settings-subpage page-title="$i18n{siteSettingsCategoryImages}"> | 242 <settings-subpage page-title="$i18n{siteSettingsCategoryImages}"> |
| 243 <button class="icon-help subpage-title-extra" |
| 244 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 231 <site-settings-category | 245 <site-settings-category |
| 232 selected-site="{{selectedSite}}" | 246 selected-site="{{selectedSite}}" |
| 233 category="{{ContentSettingsTypes.IMAGES}}"> | 247 category="{{ContentSettingsTypes.IMAGES}}"> |
| 234 </site-settings-category> | 248 </site-settings-category> |
| 235 </settings-subpage> | 249 </settings-subpage> |
| 236 </template> | 250 </template> |
| 237 <template is="dom-if" route-path="/siteSettings/location" no-search> | 251 <template is="dom-if" route-path="/siteSettings/location" no-search> |
| 238 <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}"> | 252 <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}"> |
| 253 <button class="icon-help subpage-title-extra" |
| 254 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 239 <site-settings-category | 255 <site-settings-category |
| 240 selected-site="{{selectedSite}}" | 256 selected-site="{{selectedSite}}" |
| 241 category="{{ContentSettingsTypes.GEOLOCATION}}"> | 257 category="{{ContentSettingsTypes.GEOLOCATION}}"> |
| 242 </site-settings-category> | 258 </site-settings-category> |
| 243 </settings-subpage> | 259 </settings-subpage> |
| 244 </template> | 260 </template> |
| 245 <template is="dom-if" route-path="/siteSettings/handlers" no-search> | 261 <template is="dom-if" route-path="/siteSettings/handlers" no-search> |
| 246 <settings-subpage page-title="$i18n{siteSettingsCategoryHandlers}"> | 262 <settings-subpage page-title="$i18n{siteSettingsCategoryHandlers}"> |
| 247 <protocol-handlers></protocol-handlers> | 263 <protocol-handlers></protocol-handlers> |
| 248 </settings-subpage> | 264 </settings-subpage> |
| 249 </template> | 265 </template> |
| 250 <template is="dom-if" route-path="/siteSettings/zoomLevels" no-search> | 266 <template is="dom-if" route-path="/siteSettings/zoomLevels" no-search> |
| 251 <settings-subpage page-title="$i18n{siteSettingsCategoryZoomLevels}"> | 267 <settings-subpage page-title="$i18n{siteSettingsCategoryZoomLevels}"> |
| 252 <zoom-levels></zoom-levels> | 268 <zoom-levels></zoom-levels> |
| 253 </settings-subpage> | 269 </settings-subpage> |
| 254 </template> | 270 </template> |
| 255 <template is="dom-if" route-path="/siteSettings/javascript" no-search> | 271 <template is="dom-if" route-path="/siteSettings/javascript" no-search> |
| 256 <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}"> | 272 <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}"> |
| 273 <button class="icon-help subpage-title-extra" |
| 274 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 257 <site-settings-category | 275 <site-settings-category |
| 258 selected-site="{{selectedSite}}" | 276 selected-site="{{selectedSite}}" |
| 259 category="{{ContentSettingsTypes.JAVASCRIPT}}"> | 277 category="{{ContentSettingsTypes.JAVASCRIPT}}"> |
| 260 </site-settings-category> | 278 </site-settings-category> |
| 261 </settings-subpage> | 279 </settings-subpage> |
| 262 </template> | 280 </template> |
| 263 <template is="dom-if" route-path="/siteSettings/keygen" no-search> | 281 <template is="dom-if" route-path="/siteSettings/keygen" no-search> |
| 264 <settings-subpage page-title="$i18n{siteSettingsKeygen}"> | 282 <settings-subpage page-title="$i18n{siteSettingsKeygen}"> |
| 283 <button class="icon-help subpage-title-extra" |
| 284 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 265 <site-settings-category | 285 <site-settings-category |
| 266 selected-site="{{selectedSite}}" | 286 selected-site="{{selectedSite}}" |
| 267 category="{{ContentSettingsTypes.KEYGEN}}"> | 287 category="{{ContentSettingsTypes.KEYGEN}}"> |
| 268 </site-settings-category> | 288 </site-settings-category> |
| 269 </settings-subpage> | 289 </settings-subpage> |
| 270 </template> | 290 </template> |
| 271 <template is="dom-if" route-path="/siteSettings/microphone" no-search> | 291 <template is="dom-if" route-path="/siteSettings/microphone" no-search> |
| 272 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}"> | 292 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}"> |
| 293 <button class="icon-help subpage-title-extra" |
| 294 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 273 <site-settings-category | 295 <site-settings-category |
| 274 selected-site="{{selectedSite}}" | 296 selected-site="{{selectedSite}}" |
| 275 category="{{ContentSettingsTypes.MIC}}"> | 297 category="{{ContentSettingsTypes.MIC}}"> |
| 276 <media-picker type="mic" class="media-picker"></media-picker> | 298 <media-picker type="mic" class="media-picker"></media-picker> |
| 277 </site-settings-category> | 299 </site-settings-category> |
| 278 </settings-subpage> | 300 </settings-subpage> |
| 279 </template> | 301 </template> |
| 280 <template is="dom-if" route-path="/siteSettings/notifications" no-search> | 302 <template is="dom-if" route-path="/siteSettings/notifications" no-search> |
| 281 <settings-subpage page-title="$i18n{siteSettingsCategoryNotifications}"> | 303 <settings-subpage page-title="$i18n{siteSettingsCategoryNotifications}"> |
| 304 <button class="icon-help subpage-title-extra" |
| 305 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 282 <site-settings-category | 306 <site-settings-category |
| 283 selected-site="{{selectedSite}}" | 307 selected-site="{{selectedSite}}" |
| 284 category="{{ContentSettingsTypes.NOTIFICATIONS}}"> | 308 category="{{ContentSettingsTypes.NOTIFICATIONS}}"> |
| 285 </site-settings-category> | 309 </site-settings-category> |
| 286 </settings-subpage> | 310 </settings-subpage> |
| 287 </template> | 311 </template> |
| 288 <template is="dom-if" route-path="/siteSettings/flash" no-search> | 312 <template is="dom-if" route-path="/siteSettings/flash" no-search> |
| 289 <settings-subpage page-title="$i18n{siteSettingsFlash}"> | 313 <settings-subpage page-title="$i18n{siteSettingsFlash}"> |
| 314 <button class="icon-help subpage-title-extra" |
| 315 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 290 <site-settings-category | 316 <site-settings-category |
| 291 selected-site="{{selectedSite}}" | 317 selected-site="{{selectedSite}}" |
| 292 category="{{ContentSettingsTypes.PLUGINS}}"> | 318 category="{{ContentSettingsTypes.PLUGINS}}"> |
| 293 </site-settings-category> | 319 </site-settings-category> |
| 294 </settings-subpage> | 320 </settings-subpage> |
| 295 </template> | 321 </template> |
| 296 <template is="dom-if" route-path="/siteSettings/popups" no-search> | 322 <template is="dom-if" route-path="/siteSettings/popups" no-search> |
| 297 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}"> | 323 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}"> |
| 324 <button class="icon-help subpage-title-extra" |
| 325 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 298 <site-settings-category | 326 <site-settings-category |
| 299 selected-site="{{selectedSite}}" | 327 selected-site="{{selectedSite}}" |
| 300 category="{{ContentSettingsTypes.POPUPS}}"> | 328 category="{{ContentSettingsTypes.POPUPS}}"> |
| 301 </site-settings-category> | 329 </site-settings-category> |
| 302 </settings-subpage> | 330 </settings-subpage> |
| 303 </template> | 331 </template> |
| 304 <template is="dom-if" route-path="/siteSettings/unsandboxedPlugins" | 332 <template is="dom-if" route-path="/siteSettings/unsandboxedPlugins" |
| 305 no-search> | 333 no-search> |
| 306 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}"> | 334 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}"> |
| 335 <button class="icon-help subpage-title-extra" |
| 336 is="paper-icon-button-light" on-tap="onHelpTap_"></button> |
| 307 <site-settings-category | 337 <site-settings-category |
| 308 selected-site="{{selectedSite}}" | 338 selected-site="{{selectedSite}}" |
| 309 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}"> | 339 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}"> |
| 310 </site-settings-category> | 340 </site-settings-category> |
| 311 </settings-subpage> | 341 </settings-subpage> |
| 312 </template> | 342 </template> |
| 313 <template is="dom-if" route-path="/siteSettings/usbDevices" no-search> | 343 <template is="dom-if" route-path="/siteSettings/usbDevices" no-search> |
| 314 <settings-subpage page-title="$i18n{siteSettingsUsbDevices}"> | 344 <settings-subpage page-title="$i18n{siteSettingsUsbDevices}"> |
| 315 <usb-devices></usb-devices> | 345 <usb-devices></usb-devices> |
| 316 </settings-subpage> | 346 </settings-subpage> |
| 317 </template> | 347 </template> |
| 318 <template is="dom-if" route-path="/siteSettings/siteDetails" no-search> | 348 <template is="dom-if" route-path="/siteSettings/siteDetails" no-search> |
| 319 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}"> | 349 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}"> |
| 320 <site-details site="[[selectedSite]]"></site-details> | 350 <site-details site="[[selectedSite]]"></site-details> |
| 321 </settings-subpage> | 351 </settings-subpage> |
| 322 </template> | 352 </template> |
| 323 </settings-animated-pages> | 353 </settings-animated-pages> |
| 324 </template> | 354 </template> |
| 325 <script src="privacy_page.js"></script> | 355 <script src="privacy_page.js"></script> |
| 326 </dom-module> | 356 </dom-module> |
| OLD | NEW |