| 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/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"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 4 <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"> | 5 <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"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 5 <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"> |
| 6 <link rel="import" href="/controls/settings_checkbox.html"> | 8 <link rel="import" href="/controls/settings_checkbox.html"> |
| 7 <link rel="import" href="/route.html"> | 9 <link rel="import" href="/route.html"> |
| 8 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 10 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 9 <link rel="import" href="/settings_page/settings_subpage.html"> | 11 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 10 <link rel="import" href="/settings_shared_css.html"> | 12 <link rel="import" href="/settings_shared_css.html"> |
| 11 <link rel="import" href="/site_settings/all_sites.html"> | 13 <link rel="import" href="/site_settings/all_sites.html"> |
| 12 <link rel="import" href="/site_settings/constants.html"> | 14 <link rel="import" href="/site_settings/constants.html"> |
| 13 <link rel="import" href="/site_settings/media_picker.html"> | 15 <link rel="import" href="/site_settings/media_picker.html"> |
| 14 <link rel="import" href="/site_settings/protocol_handlers.html"> | 16 <link rel="import" href="/site_settings/protocol_handlers.html"> |
| 15 <link rel="import" href="/site_settings/site_data.html"> | 17 <link rel="import" href="/site_settings/site_data.html"> |
| 16 <link rel="import" href="/site_settings_page/site_settings_page.html"> | 18 <link rel="import" href="/site_settings_page/site_settings_page.html"> |
| 17 | 19 |
| 18 <if expr="use_nss_certs"> | 20 <if expr="use_nss_certs"> |
| 19 <link rel="import" href="/certificate_manager_page/certificate_manager_page.html
"> | 21 <link rel="import" href="/certificate_manager_page/certificate_manager_page.html
"> |
| 20 </if> | 22 </if> |
| 21 <if expr="is_win or is_macosx"> | |
| 22 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html"> | 23 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html"> |
| 23 </if> | |
| 24 | 24 |
| 25 <dom-module id="settings-privacy-page"> | 25 <dom-module id="settings-privacy-page"> |
| 26 <template> | 26 <template> |
| 27 <style include="settings-shared"></style> | 27 <style include="settings-shared"> |
| 28 /* TODO(dbeam): this is similar to a 1 line checkbox. Worth somehow |
| 29 * combining? */ |
| 30 #metricsReporting { |
| 31 align-items: center; |
| 32 display: flex; |
| 33 min-height: var(--settings-row-min-height); |
| 34 } |
| 35 |
| 36 #metricsReportingCheckbox { |
| 37 display: inline-block; |
| 38 } |
| 39 |
| 40 #metricsReporting paper-tooltip { |
| 41 --paper-tooltip: var(--cr-policy-tooltip); |
| 42 } |
| 43 |
| 44 #indicator { |
| 45 -webkit-margin-start: var(--checkbox-spacing); |
| 46 } |
| 47 </style> |
| 28 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> | 48 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> |
| 29 <settings-clear-browsing-data-dialog prefs="{{prefs}}" | 49 <settings-clear-browsing-data-dialog prefs="{{prefs}}" |
| 30 on-close="onDialogClosed_"> | 50 on-close="onDialogClosed_"> |
| 31 </settings-clear-browsing-data-dialog> | 51 </settings-clear-browsing-data-dialog> |
| 32 </template> | 52 </template> |
| 33 <settings-animated-pages id="pages" section="privacy"> | 53 <settings-animated-pages id="pages" section="privacy"> |
| 34 <neon-animatable id="main"> | 54 <neon-animatable id="main"> |
| 35 <div class="settings-box block first"> | 55 <div class="settings-box block first"> |
| 36 <p class="privacy-explanation"> | 56 <p class="privacy-explanation"> |
| 37 $i18nRaw{improveBrowsingExperience} | 57 $i18nRaw{improveBrowsingExperience} |
| (...skipping 18 matching lines...) Expand all Loading... |
| 56 </settings-checkbox> | 76 </settings-checkbox> |
| 57 <settings-checkbox pref="{{prefs.safebrowsing.enabled}}" | 77 <settings-checkbox pref="{{prefs.safebrowsing.enabled}}" |
| 58 label="$i18n{safeBrowsingEnableProtection}"> | 78 label="$i18n{safeBrowsingEnableProtection}"> |
| 59 </settings-checkbox> | 79 </settings-checkbox> |
| 60 <if expr="_google_chrome"> | 80 <if expr="_google_chrome"> |
| 61 <settings-checkbox | 81 <settings-checkbox |
| 62 pref="{{prefs.spellcheck.use_spelling_service}}" | 82 pref="{{prefs.spellcheck.use_spelling_service}}" |
| 63 label="$i18n{spellingPref}"> | 83 label="$i18n{spellingPref}"> |
| 64 </settings-checkbox> | 84 </settings-checkbox> |
| 65 <if expr="chromeos"> | 85 <if expr="chromeos"> |
| 66 <settings-checkbox | 86 <settings-checkbox |
| 67 pref="{{prefs.cros.metrics.reportingEnabled}}" | 87 pref="{{prefs.cros.metrics.reportingEnabled}}" |
| 68 label="$i18n{enableLogging}"> | 88 label="$i18n{enableLogging}"> |
| 69 </settings-checkbox> | 89 </settings-checkbox> |
| 70 </if> | 90 </if><!-- chromeos --> |
| 71 <!-- TODO(jlklein): Add non-chromeos metrics box. --> | 91 <if expr="not chromeos"> |
| 72 </if> | 92 <div id="metricsReporting"> |
| 93 <paper-checkbox id="metricsReportingCheckbox" |
| 94 on-tap="onMetricsReportingCheckboxTap_" |
| 95 checked="[[metricsReporting_.enabled]]" |
| 96 disabled="[[metricsReporting_.managed]]"> |
| 97 $i18n{enableLogging} |
| 98 </paper-checkbox> |
| 99 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> |
| 100 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> |
| 101 <paper-tooltip for="indicator" position="top" |
| 102 fit-to-visible-bounds> |
| 103 $i18n{controlledSettingPolicy} |
| 104 </paper-tooltip> |
| 105 </template> |
| 106 </div> |
| 107 </if><!-- not chromeos --> |
| 108 </if><!-- _google_chrome --> |
| 73 <settings-checkbox pref="{{prefs.enable_do_not_track}}" | 109 <settings-checkbox pref="{{prefs.enable_do_not_track}}" |
| 74 label="$i18n{doNotTrack}"> | 110 label="$i18n{doNotTrack}"> |
| 75 </settings-checkbox> | 111 </settings-checkbox> |
| 76 <if expr="chromeos"> | 112 <if expr="chromeos"> |
| 77 <settings-checkbox | 113 <settings-checkbox |
| 78 pref="{{prefs.cros.device.attestation_for_content_protection_enabl
ed}}" | 114 pref="{{prefs.cros.device.attestation_for_content_protection_enabl
ed}}" |
| 79 label="$i18n{enableContentProtectionAttestation}"> | 115 label="$i18n{enableContentProtectionAttestation}"> |
| 80 </settings-checkbox> | 116 </settings-checkbox> |
| 81 <settings-checkbox | 117 <settings-checkbox |
| 82 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" | 118 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 | 290 |
| 255 <template is="dom-if" name="site-details" no-search> | 291 <template is="dom-if" name="site-details" no-search> |
| 256 <settings-subpage page-title="[[selectedSite.originForDisplay]]"> | 292 <settings-subpage page-title="[[selectedSite.originForDisplay]]"> |
| 257 <site-details site="[[selectedSite]]"></site-details> | 293 <site-details site="[[selectedSite]]"></site-details> |
| 258 </settings-subpage> | 294 </settings-subpage> |
| 259 </template> | 295 </template> |
| 260 </settings-animated-pages> | 296 </settings-animated-pages> |
| 261 </template> | 297 </template> |
| 262 <script src="privacy_page.js"></script> | 298 <script src="privacy_page.js"></script> |
| 263 </dom-module> | 299 </dom-module> |
| OLD | NEW |