| 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 27 matching lines...) Expand all Loading... |
| 38 /* TODO(dbeam): this is similar to a 1 line checkbox. Worth somehow | 38 /* TODO(dbeam): this is similar to a 1 line checkbox. Worth somehow |
| 39 * combining? */ | 39 * combining? */ |
| 40 #metricsReporting { | 40 #metricsReporting { |
| 41 align-items: center; | 41 align-items: center; |
| 42 display: flex; | 42 display: flex; |
| 43 min-height: var(--settings-row-min-height); | 43 min-height: var(--settings-row-min-height); |
| 44 } | 44 } |
| 45 | 45 |
| 46 #metricsReportingCheckbox { | 46 #metricsReportingCheckbox { |
| 47 display: inline-block; | 47 display: inline-block; |
| 48 flex: 1; | |
| 49 } | 48 } |
| 50 | 49 |
| 51 #metricsReporting paper-tooltip { | 50 #metricsReporting paper-tooltip { |
| 52 --paper-tooltip: var(--cr-policy-tooltip); | 51 --paper-tooltip: var(--cr-policy-tooltip); |
| 53 } | 52 } |
| 54 | 53 |
| 55 #indicator { | 54 #indicator { |
| 56 -webkit-margin-start: var(--checkbox-spacing); | 55 -webkit-margin-start: var(--checkbox-spacing); |
| 57 } | 56 } |
| 57 |
| 58 #restart { |
| 59 flex: 1; |
| 60 text-align: end; |
| 61 } |
| 58 </style> | 62 </style> |
| 59 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> | 63 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> |
| 60 <settings-clear-browsing-data-dialog prefs="{{prefs}}" | 64 <settings-clear-browsing-data-dialog prefs="{{prefs}}" |
| 61 on-close="onDialogClosed_"> | 65 on-close="onDialogClosed_"> |
| 62 </settings-clear-browsing-data-dialog> | 66 </settings-clear-browsing-data-dialog> |
| 63 </template> | 67 </template> |
| 64 <settings-animated-pages id="pages" section="privacy"> | 68 <settings-animated-pages id="pages" section="privacy"> |
| 65 <neon-animatable route-path="default"> | 69 <neon-animatable route-path="default"> |
| 66 <div class="settings-box block first"> | 70 <div class="settings-box block first"> |
| 67 <p class="privacy-explanation"> | 71 <p class="privacy-explanation"> |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 $i18n{enableLogging} | 108 $i18n{enableLogging} |
| 105 </paper-checkbox> | 109 </paper-checkbox> |
| 106 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> | 110 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> |
| 107 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> | 111 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> |
| 108 <paper-tooltip for="indicator" position="top" | 112 <paper-tooltip for="indicator" position="top" |
| 109 fit-to-visible-bounds> | 113 fit-to-visible-bounds> |
| 110 $i18n{controlledSettingPolicy} | 114 $i18n{controlledSettingPolicy} |
| 111 </paper-tooltip> | 115 </paper-tooltip> |
| 112 </template> | 116 </template> |
| 113 <template is="dom-if" if="[[showRestart_]]" restamp> | 117 <template is="dom-if" if="[[showRestart_]]" restamp> |
| 114 <paper-button on-tap="onRestartTap_">$i18n{restart}</paper-button> | 118 <div id="restart"> |
| 119 <paper-button on-tap="onRestartTap_"> |
| 120 $i18n{restart} |
| 121 </paper-button> |
| 122 </div> |
| 115 </template> | 123 </template> |
| 116 </div> | 124 </div> |
| 117 </if><!-- not chromeos --> | 125 </if><!-- not chromeos --> |
| 118 </if><!-- _google_chrome --> | 126 </if><!-- _google_chrome --> |
| 119 <settings-checkbox pref="{{prefs.enable_do_not_track}}" | 127 <settings-checkbox pref="{{prefs.enable_do_not_track}}" |
| 120 label="$i18n{doNotTrack}"> | 128 label="$i18n{doNotTrack}"> |
| 121 </settings-checkbox> | 129 </settings-checkbox> |
| 122 <if expr="chromeos"> | 130 <if expr="chromeos"> |
| 123 <settings-checkbox | 131 <settings-checkbox |
| 124 pref="{{prefs.cros.device.attestation_for_content_protection_enabl
ed}}" | 132 pref="{{prefs.cros.device.attestation_for_content_protection_enabl
ed}}" |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 </template> | 360 </template> |
| 353 <template is="dom-if" route-path="/content/siteDetails" no-search> | 361 <template is="dom-if" route-path="/content/siteDetails" no-search> |
| 354 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}"> | 362 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}"> |
| 355 <site-details site="[[selectedSite]]"></site-details> | 363 <site-details site="[[selectedSite]]"></site-details> |
| 356 </settings-subpage> | 364 </settings-subpage> |
| 357 </template> | 365 </template> |
| 358 </settings-animated-pages> | 366 </settings-animated-pages> |
| 359 </template> | 367 </template> |
| 360 <script src="privacy_page.js"></script> | 368 <script src="privacy_page.js"></script> |
| 361 </dom-module> | 369 </dom-module> |
| OLD | NEW |