| 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-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 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 <dom-module id="settings-privacy-page"> | 33 <dom-module id="settings-privacy-page"> |
| 34 <template> | 34 <template> |
| 35 <style include="settings-shared"> | 35 <style include="settings-shared"> |
| 36 button[is='paper-icon-button-light'].icon-help { | 36 button[is='paper-icon-button-light'].icon-help { |
| 37 background-image: url(../images/help_outline.svg); | 37 background-image: url(../images/help_outline.svg); |
| 38 } | 38 } |
| 39 | 39 |
| 40 /* TODO(dbeam): this is similar to a 1 line checkbox. Worth somehow | 40 /* TODO(dbeam): this is similar to a 1 line checkbox. Worth somehow |
| 41 * combining? */ | 41 * combining? */ |
| 42 #metricsReporting { | 42 #metricsReporting, |
| 43 #safeBrowsingExtendedReporting { |
| 43 align-items: center; | 44 align-items: center; |
| 44 display: flex; | 45 display: flex; |
| 45 min-height: var(--settings-row-min-height); | 46 min-height: var(--settings-row-min-height); |
| 46 } | 47 } |
| 47 | 48 |
| 48 #metricsReportingCheckbox { | 49 #metricsReportingCheckbox, |
| 50 #safeBrowsingExtendedReportingCheckbox { |
| 49 display: inline-block; | 51 display: inline-block; |
| 50 } | 52 } |
| 51 | 53 |
| 52 #metricsReporting paper-tooltip { | 54 #metricsReporting paper-tooltip { |
| 53 --paper-tooltip: var(--cr-policy-tooltip); | 55 --paper-tooltip: var(--cr-policy-tooltip); |
| 54 } | 56 } |
| 55 | 57 |
| 56 #indicator { | 58 #indicator { |
| 57 -webkit-margin-start: var(--checkbox-spacing); | 59 -webkit-margin-start: var(--checkbox-spacing); |
| 58 } | 60 } |
| 59 | 61 |
| 60 #restart { | 62 #restart { |
| 61 flex: 1; | 63 flex: 1; |
| 62 text-align: end; | 64 text-align: end; |
| 63 } | 65 } |
| 64 </style> | 66 </style> |
| 65 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> | 67 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> |
| 66 <settings-clear-browsing-data-dialog prefs="{{prefs}}" | 68 <settings-clear-browsing-data-dialog prefs="{{prefs}}" |
| 67 on-close="onDialogClosed_"> | 69 on-close="onDialogClosed_"> |
| 68 </settings-clear-browsing-data-dialog> | 70 </settings-clear-browsing-data-dialog> |
| 69 </template> | 71 </template> |
| 70 <settings-animated-pages id="pages" section="privacy"> | 72 <settings-animated-pages id="pages" section="privacy"> |
| 71 <neon-animatable route-path="default"> | 73 <neon-animatable route-path="default"> |
| 72 <div class="settings-box block first"> | 74 <div class="settings-box block first"> |
| 73 <p class="privacy-explanation"> | 75 <p class="privacy-explanation"> |
| 74 $i18nRaw{improveBrowsingExperience} | 76 $i18nRaw{improveBrowsingExperience} |
| 75 </p> | 77 </p> |
| 76 <settings-checkbox | 78 <settings-checkbox |
| 77 pref="{{prefs.alternate_error_pages.enabled}}" | 79 pref="{{prefs.alternate_error_pages.enabled}}" |
| 78 label="$i18n{linkDoctorPref}"> | 80 label="$i18n{linkDoctorPref}"> |
| 79 </settings-checkbox> | 81 </settings-checkbox> |
| 80 <settings-checkbox | 82 <settings-checkbox |
| 81 pref="{{prefs.search.suggest_enabled}}" | 83 pref="{{prefs.search.suggest_enabled}}" |
| 82 label="$i18n{searchSuggestPref}" | 84 label="$i18n{searchSuggestPref}" |
| 83 hidden="[[!pageVisibility.searchPrediction]]"> | 85 hidden="[[!pageVisibility.searchPrediction]]"> |
| 84 </settings-checkbox> | 86 </settings-checkbox> |
| 85 <settings-checkbox | 87 <settings-checkbox |
| 86 pref="{{prefs.net.network_prediction_options}}" | 88 pref="{{prefs.net.network_prediction_options}}" |
| 87 label="$i18n{networkPredictionEnabled}" | 89 label="$i18n{networkPredictionEnabled}" |
| 88 hidden="[[!pageVisibility.networkPrediction]]"> | 90 hidden="[[!pageVisibility.networkPrediction]]"> |
| 89 </settings-checkbox> | 91 </settings-checkbox> |
| 90 <paper-checkbox id="safeBrowsingExtendedReportingCheckbox" | 92 <div id="safeBrowsingExtendedReporting"> |
| 91 on-tap="onSafeBrowsingExtendedReportingCheckboxTap_" | 93 <paper-checkbox id="safeBrowsingExtendedReportingCheckbox" |
| 92 checked="[[safeBrowsingExtendedReportingEnabled_]]"> | 94 on-tap="onSafeBrowsingExtendedReportingCheckboxTap_" |
| 93 $i18n{safeBrowsingEnableExtendedReporting} | 95 checked="[[safeBrowsingExtendedReportingEnabled_]]"> |
| 94 </paper-checkbox> | 96 $i18n{safeBrowsingEnableExtendedReporting} |
| 97 </paper-checkbox> |
| 98 </div> |
| 95 <settings-checkbox pref="{{prefs.safebrowsing.enabled}}" | 99 <settings-checkbox pref="{{prefs.safebrowsing.enabled}}" |
| 96 label="$i18n{safeBrowsingEnableProtection}"> | 100 label="$i18n{safeBrowsingEnableProtection}"> |
| 97 </settings-checkbox> | 101 </settings-checkbox> |
| 98 <if expr="_google_chrome"> | 102 <if expr="_google_chrome"> |
| 99 <if expr="chromeos"> | 103 <if expr="chromeos"> |
| 100 <settings-checkbox | 104 <settings-checkbox |
| 101 pref="{{prefs.cros.metrics.reportingEnabled}}" | 105 pref="{{prefs.cros.metrics.reportingEnabled}}" |
| 102 label="$i18n{enableLogging}"> | 106 label="$i18n{enableLogging}"> |
| 103 </settings-checkbox> | 107 </settings-checkbox> |
| 104 </if><!-- chromeos --> | 108 </if><!-- chromeos --> |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 $i18n{siteSettingsCookieRemoveAll} | 383 $i18n{siteSettingsCookieRemoveAll} |
| 380 </paper-button> | 384 </paper-button> |
| 381 <site-data-details-subpage page-title="{{pageTitle}}"> | 385 <site-data-details-subpage page-title="{{pageTitle}}"> |
| 382 </site-data-details-subpage> | 386 </site-data-details-subpage> |
| 383 </settings-subpage> | 387 </settings-subpage> |
| 384 </template> | 388 </template> |
| 385 </settings-animated-pages> | 389 </settings-animated-pages> |
| 386 </template> | 390 </template> |
| 387 <script src="privacy_page.js"></script> | 391 <script src="privacy_page.js"></script> |
| 388 </dom-module> | 392 </dom-module> |
| OLD | NEW |