| OLD | NEW |
| 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_checkbox.html"> | 9 <link rel="import" href="/controls/settings_checkbox.html"> |
| 10 <link rel="import" href="/controls/settings_toggle_button.html"> | 10 <link rel="import" href="/controls/settings_toggle_button.html"> |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 </if> | 31 </if> |
| 32 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html"> | 32 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html"> |
| 33 | 33 |
| 34 <dom-module id="settings-privacy-page"> | 34 <dom-module id="settings-privacy-page"> |
| 35 <template> | 35 <template> |
| 36 <style include="settings-shared"> | 36 <style include="settings-shared"> |
| 37 button[is='paper-icon-button-light'].icon-help { | 37 button[is='paper-icon-button-light'].icon-help { |
| 38 background-image: url(../images/help_outline.svg); | 38 background-image: url(../images/help_outline.svg); |
| 39 } | 39 } |
| 40 | 40 |
| 41 /* TODO(dbeam): this is similar to a 1 line checkbox. Worth somehow | 41 .settings-row-min-height { |
| 42 * combining? */ | |
| 43 #metricsReporting, | |
| 44 #safeBrowsingExtendedReporting { | |
| 45 align-items: center; | |
| 46 display: flex; | |
| 47 min-height: var(--settings-row-min-height); | 42 min-height: var(--settings-row-min-height); |
| 48 } | 43 } |
| 49 | 44 |
| 50 #metricsReportingCheckbox, | 45 #metricsReportingCheckbox, |
| 51 #safeBrowsingExtendedReportingCheckbox { | 46 #safeBrowsingExtendedReportingCheckbox { |
| 52 display: inline-block; | 47 display: inline-block; |
| 53 } | 48 } |
| 54 | 49 |
| 55 #metricsReportingCheckbox:not([disabled]), | 50 #metricsReportingCheckbox:not([disabled]), |
| 56 #safeBrowsingExtendedReportingCheckbox { | 51 #safeBrowsingExtendedReportingCheckbox { |
| 57 width: 100%; | 52 width: 100%; |
| 58 } | 53 } |
| 59 | 54 |
| 60 #metricsReporting paper-tooltip { | 55 #metricsReporting paper-tooltip { |
| 61 --paper-tooltip: var(--cr-policy-tooltip); | 56 --paper-tooltip: var(--cr-policy-tooltip); |
| 62 } | 57 } |
| 63 | 58 |
| 64 #indicator { | 59 #indicator { |
| 65 -webkit-margin-start: var(--checkbox-spacing); | 60 -webkit-margin-start: var(--checkbox-spacing); |
| 66 } | 61 } |
| 67 | 62 |
| 68 #restart { | 63 #restart { |
| 69 flex: 1; | |
| 70 text-align: end; | 64 text-align: end; |
| 71 } | 65 } |
| 72 </style> | 66 </style> |
| 73 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> | 67 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> |
| 74 <settings-clear-browsing-data-dialog prefs="{{prefs}}" | 68 <settings-clear-browsing-data-dialog prefs="{{prefs}}" |
| 75 on-close="onDialogClosed_"> | 69 on-close="onDialogClosed_"> |
| 76 </settings-clear-browsing-data-dialog> | 70 </settings-clear-browsing-data-dialog> |
| 77 </template> | 71 </template> |
| 78 <settings-animated-pages id="pages" section="privacy"> | 72 <settings-animated-pages id="pages" section="privacy"> |
| 79 <neon-animatable route-path="default"> | 73 <neon-animatable route-path="default"> |
| 80 <div class="settings-box block first"> | 74 <div class="settings-box block first"> |
| 81 <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p> | 75 <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p> |
| 82 <settings-checkbox pref="{{prefs.alternate_error_pages.enabled}}" | 76 <settings-checkbox pref="{{prefs.alternate_error_pages.enabled}}" |
| 83 label="$i18n{linkDoctorPref}"> | 77 label="$i18n{linkDoctorPref}"> |
| 84 </settings-checkbox> | 78 </settings-checkbox> |
| 85 <settings-checkbox pref="{{prefs.search.suggest_enabled}}" | 79 <settings-checkbox pref="{{prefs.search.suggest_enabled}}" |
| 86 label="$i18n{searchSuggestPref}" | 80 label="$i18n{searchSuggestPref}" |
| 87 hidden="[[!pageVisibility.searchPrediction]]"> | 81 hidden="[[!pageVisibility.searchPrediction]]"> |
| 88 </settings-checkbox> | 82 </settings-checkbox> |
| 89 <settings-checkbox pref="{{prefs.net.network_prediction_options}}" | 83 <settings-checkbox pref="{{prefs.net.network_prediction_options}}" |
| 90 label="$i18n{networkPredictionEnabled}" | 84 label="$i18n{networkPredictionEnabled}" |
| 91 hidden="[[!pageVisibility.networkPrediction]]"> | 85 hidden="[[!pageVisibility.networkPrediction]]"> |
| 92 </settings-checkbox> | 86 </settings-checkbox> |
| 93 <div id="safeBrowsingExtendedReporting"> | 87 <div class="layout horizontal center settings-row-min-height"> |
| 94 <paper-checkbox id="safeBrowsingExtendedReportingCheckbox" | 88 <paper-checkbox id="safeBrowsingExtendedReportingCheckbox" |
| 95 on-tap="onSafeBrowsingExtendedReportingCheckboxTap_" | 89 on-tap="onSafeBrowsingExtendedReportingCheckboxTap_" |
| 96 checked="[[safeBrowsingExtendedReportingEnabled_]]"> | 90 checked="[[safeBrowsingExtendedReportingEnabled_]]"> |
| 97 $i18n{safeBrowsingEnableExtendedReporting} | 91 $i18n{safeBrowsingEnableExtendedReporting} |
| 98 </paper-checkbox> | 92 </paper-checkbox> |
| 99 </div> | 93 </div> |
| 100 <settings-checkbox pref="{{prefs.safebrowsing.enabled}}" | 94 <settings-checkbox pref="{{prefs.safebrowsing.enabled}}" |
| 101 label="$i18n{safeBrowsingEnableProtection}"> | 95 label="$i18n{safeBrowsingEnableProtection}"> |
| 102 </settings-checkbox> | 96 </settings-checkbox> |
| 103 <if expr="_google_chrome"> | 97 <if expr="_google_chrome"> |
| 104 <if expr="chromeos"> | 98 <if expr="chromeos"> |
| 105 <settings-checkbox pref="{{prefs.cros.metrics.reportingEnabled}}" | 99 <settings-checkbox pref="{{prefs.cros.metrics.reportingEnabled}}" |
| 106 label="$i18n{enableLogging}"> | 100 label="$i18n{enableLogging}"> |
| 107 </settings-checkbox> | 101 </settings-checkbox> |
| 108 </if><!-- chromeos --> | 102 </if><!-- chromeos --> |
| 109 <if expr="not chromeos"> | 103 <if expr="not chromeos"> |
| 110 <div id="metricsReporting"> | 104 <div class="layout horizontal center settings-row-min-height"> |
| 111 <paper-checkbox id="metricsReportingCheckbox" | 105 <paper-checkbox id="metricsReportingCheckbox" |
| 112 on-tap="onMetricsReportingCheckboxTap_" | 106 on-tap="onMetricsReportingCheckboxTap_" |
| 113 checked="[[metricsReporting_.enabled]]" | 107 checked="[[metricsReporting_.enabled]]" |
| 114 disabled="[[metricsReporting_.managed]]"> | 108 disabled="[[metricsReporting_.managed]]"> |
| 115 $i18n{enableLogging} | 109 $i18n{enableLogging} |
| 116 </paper-checkbox> | 110 </paper-checkbox> |
| 117 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> | 111 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> |
| 118 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> | 112 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> |
| 119 <paper-tooltip for="indicator" position="top" | 113 <paper-tooltip for="indicator" position="top" |
| 120 fit-to-visible-bounds> | 114 fit-to-visible-bounds> |
| 121 $i18n{controlledSettingPolicy} | 115 $i18n{controlledSettingPolicy} |
| 122 </paper-tooltip> | 116 </paper-tooltip> |
| 123 </template> | 117 </template> |
| 124 <template is="dom-if" if="[[showRestart_]]" restamp> | 118 <template is="dom-if" if="[[showRestart_]]" restamp> |
| 125 <div id="restart"> | 119 <div id="restart" class="flex"> |
| 126 <paper-button on-tap="onRestartTap_"> | 120 <paper-button on-tap="onRestartTap_"> |
| 127 $i18n{restart} | 121 $i18n{restart} |
| 128 </paper-button> | 122 </paper-button> |
| 129 </div> | 123 </div> |
| 130 </template> | 124 </template> |
| 131 </div> | 125 </div> |
| 132 </if><!-- not chromeos --> | 126 </if><!-- not chromeos --> |
| 133 </if><!-- _google_chrome --> | 127 </if><!-- _google_chrome --> |
| 134 <settings-checkbox pref="{{prefs.enable_do_not_track}}" | 128 <settings-checkbox pref="{{prefs.enable_do_not_track}}" |
| 135 label="$i18n{doNotTrack}"> | 129 label="$i18n{doNotTrack}"> |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 $i18n{siteSettingsCookieRemoveAll} | 389 $i18n{siteSettingsCookieRemoveAll} |
| 396 </paper-button> | 390 </paper-button> |
| 397 <site-data-details-subpage page-title="{{pageTitle}}"> | 391 <site-data-details-subpage page-title="{{pageTitle}}"> |
| 398 </site-data-details-subpage> | 392 </site-data-details-subpage> |
| 399 </settings-subpage> | 393 </settings-subpage> |
| 400 </template> | 394 </template> |
| 401 </settings-animated-pages> | 395 </settings-animated-pages> |
| 402 </template> | 396 </template> |
| 403 <script src="privacy_page.js"></script> | 397 <script src="privacy_page.js"></script> |
| 404 </dom-module> | 398 </dom-module> |
| OLD | NEW |