Chromium Code Reviews| 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 { |
|
Dan Beam
2016/11/17 19:11:28
#metricsReporting,
#safeBrowsingExtendedReporting
lpz
2016/11/17 19:21:59
Done.
| |
| 43 align-items: center; | 43 align-items: center; |
| 44 display: flex; | 44 display: flex; |
| 45 min-height: var(--settings-row-min-height); | 45 min-height: var(--settings-row-min-height); |
| 46 } | 46 } |
| 47 | 47 |
| 48 #metricsReportingCheckbox { | 48 #metricsReportingCheckbox { |
| 49 display: inline-block; | 49 display: inline-block; |
| 50 } | 50 } |
| 51 | 51 |
| 52 #metricsReporting paper-tooltip { | 52 #metricsReporting paper-tooltip { |
| 53 --paper-tooltip: var(--cr-policy-tooltip); | 53 --paper-tooltip: var(--cr-policy-tooltip); |
| 54 } | 54 } |
| 55 | 55 |
| 56 #indicator { | 56 #indicator { |
| 57 -webkit-margin-start: var(--checkbox-spacing); | 57 -webkit-margin-start: var(--checkbox-spacing); |
| 58 } | 58 } |
| 59 | 59 |
| 60 #restart { | 60 #restart { |
| 61 flex: 1; | 61 flex: 1; |
| 62 text-align: end; | 62 text-align: end; |
| 63 } | 63 } |
| 64 | |
| 65 #safeBrowsingExtendedReporting { | |
| 66 align-items: center; | |
| 67 display: flex; | |
| 68 min-height: var(--settings-row-min-height); | |
| 69 } | |
| 70 | |
| 71 #safeBrowsingExtendedReportingCheckbox { | |
| 72 display: inline-block; | |
| 73 } | |
| 74 | |
| 64 </style> | 75 </style> |
| 65 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> | 76 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> |
| 66 <settings-clear-browsing-data-dialog prefs="{{prefs}}" | 77 <settings-clear-browsing-data-dialog prefs="{{prefs}}" |
| 67 on-close="onDialogClosed_"> | 78 on-close="onDialogClosed_"> |
| 68 </settings-clear-browsing-data-dialog> | 79 </settings-clear-browsing-data-dialog> |
| 69 </template> | 80 </template> |
| 70 <settings-animated-pages id="pages" section="privacy"> | 81 <settings-animated-pages id="pages" section="privacy"> |
| 71 <neon-animatable route-path="default"> | 82 <neon-animatable route-path="default"> |
| 72 <div class="settings-box block first"> | 83 <div class="settings-box block first"> |
| 73 <p class="privacy-explanation"> | 84 <p class="privacy-explanation"> |
| 74 $i18nRaw{improveBrowsingExperience} | 85 $i18nRaw{improveBrowsingExperience} |
| 75 </p> | 86 </p> |
| 76 <settings-checkbox | 87 <settings-checkbox |
| 77 pref="{{prefs.alternate_error_pages.enabled}}" | 88 pref="{{prefs.alternate_error_pages.enabled}}" |
| 78 label="$i18n{linkDoctorPref}"> | 89 label="$i18n{linkDoctorPref}"> |
| 79 </settings-checkbox> | 90 </settings-checkbox> |
| 80 <settings-checkbox | 91 <settings-checkbox |
| 81 pref="{{prefs.search.suggest_enabled}}" | 92 pref="{{prefs.search.suggest_enabled}}" |
| 82 label="$i18n{searchSuggestPref}" | 93 label="$i18n{searchSuggestPref}" |
| 83 hidden="[[!pageVisibility.searchPrediction]]"> | 94 hidden="[[!pageVisibility.searchPrediction]]"> |
| 84 </settings-checkbox> | 95 </settings-checkbox> |
| 85 <settings-checkbox | 96 <settings-checkbox |
| 86 pref="{{prefs.net.network_prediction_options}}" | 97 pref="{{prefs.net.network_prediction_options}}" |
| 87 label="$i18n{networkPredictionEnabled}" | 98 label="$i18n{networkPredictionEnabled}" |
| 88 hidden="[[!pageVisibility.networkPrediction]]"> | 99 hidden="[[!pageVisibility.networkPrediction]]"> |
| 89 </settings-checkbox> | 100 </settings-checkbox> |
| 90 <paper-checkbox id="safeBrowsingExtendedReportingCheckbox" | 101 <div id="safeBrowsingExtendedReporting"> |
| 91 on-tap="onSafeBrowsingExtendedReportingCheckboxTap_" | 102 <paper-checkbox id="safeBrowsingExtendedReportingCheckbox" |
| 92 checked="[[safeBrowsingExtendedReportingEnabled_]]"> | 103 on-tap="onSafeBrowsingExtendedReportingCheckboxTap_" |
| 93 $i18n{safeBrowsingEnableExtendedReporting} | 104 checked="[[safeBrowsingExtendedReportingEnabled_]]"> |
| 94 </paper-checkbox> | 105 $i18n{safeBrowsingEnableExtendedReporting} |
| 106 </paper-checkbox> | |
| 107 </div> | |
| 95 <settings-checkbox pref="{{prefs.safebrowsing.enabled}}" | 108 <settings-checkbox pref="{{prefs.safebrowsing.enabled}}" |
| 96 label="$i18n{safeBrowsingEnableProtection}"> | 109 label="$i18n{safeBrowsingEnableProtection}"> |
| 97 </settings-checkbox> | 110 </settings-checkbox> |
| 98 <if expr="_google_chrome"> | 111 <if expr="_google_chrome"> |
| 99 <if expr="chromeos"> | 112 <if expr="chromeos"> |
| 100 <settings-checkbox | 113 <settings-checkbox |
| 101 pref="{{prefs.cros.metrics.reportingEnabled}}" | 114 pref="{{prefs.cros.metrics.reportingEnabled}}" |
| 102 label="$i18n{enableLogging}"> | 115 label="$i18n{enableLogging}"> |
| 103 </settings-checkbox> | 116 </settings-checkbox> |
| 104 </if><!-- chromeos --> | 117 </if><!-- chromeos --> |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 379 $i18n{siteSettingsCookieRemoveAll} | 392 $i18n{siteSettingsCookieRemoveAll} |
| 380 </paper-button> | 393 </paper-button> |
| 381 <site-data-details-subpage page-title="{{pageTitle}}"> | 394 <site-data-details-subpage page-title="{{pageTitle}}"> |
| 382 </site-data-details-subpage> | 395 </site-data-details-subpage> |
| 383 </settings-subpage> | 396 </settings-subpage> |
| 384 </template> | 397 </template> |
| 385 </settings-animated-pages> | 398 </settings-animated-pages> |
| 386 </template> | 399 </template> |
| 387 <script src="privacy_page.js"></script> | 400 <script src="privacy_page.js"></script> |
| 388 </dom-module> | 401 </dom-module> |
| OLD | NEW |