| 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-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"> |
| 7 <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"> |
| 8 <link rel="import" href="/controls/settings_checkbox.html"> | 9 <link rel="import" href="/controls/settings_checkbox.html"> |
| 9 <link rel="import" href="/controls/settings_toggle_button.html"> | 10 <link rel="import" href="/controls/settings_toggle_button.html"> |
| 11 <link rel="import" href="/lifetime_browser_proxy.html"> |
| 10 <link rel="import" href="/route.html"> | 12 <link rel="import" href="/route.html"> |
| 11 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 13 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 12 <link rel="import" href="/settings_page/settings_subpage.html"> | 14 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 13 <link rel="import" href="/settings_shared_css.html"> | 15 <link rel="import" href="/settings_shared_css.html"> |
| 14 <link rel="import" href="/site_settings/all_sites.html"> | 16 <link rel="import" href="/site_settings/all_sites.html"> |
| 15 <link rel="import" href="/site_settings/constants.html"> | 17 <link rel="import" href="/site_settings/constants.html"> |
| 16 <link rel="import" href="/site_settings/media_picker.html"> | 18 <link rel="import" href="/site_settings/media_picker.html"> |
| 17 <link rel="import" href="/site_settings/protocol_handlers.html"> | 19 <link rel="import" href="/site_settings/protocol_handlers.html"> |
| 18 <link rel="import" href="/site_settings/site_settings_category.html"> | 20 <link rel="import" href="/site_settings/site_settings_category.html"> |
| 19 <link rel="import" href="/site_settings/usb_devices.html"> | 21 <link rel="import" href="/site_settings/usb_devices.html"> |
| (...skipping 16 matching lines...) Expand all Loading... |
| 36 /* 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 |
| 37 * combining? */ | 39 * combining? */ |
| 38 #metricsReporting { | 40 #metricsReporting { |
| 39 align-items: center; | 41 align-items: center; |
| 40 display: flex; | 42 display: flex; |
| 41 min-height: var(--settings-row-min-height); | 43 min-height: var(--settings-row-min-height); |
| 42 } | 44 } |
| 43 | 45 |
| 44 #metricsReportingCheckbox { | 46 #metricsReportingCheckbox { |
| 45 display: inline-block; | 47 display: inline-block; |
| 48 flex: 1; |
| 46 } | 49 } |
| 47 | 50 |
| 48 #metricsReporting paper-tooltip { | 51 #metricsReporting paper-tooltip { |
| 49 --paper-tooltip: var(--cr-policy-tooltip); | 52 --paper-tooltip: var(--cr-policy-tooltip); |
| 50 } | 53 } |
| 51 | 54 |
| 52 #indicator { | 55 #indicator { |
| 53 -webkit-margin-start: var(--checkbox-spacing); | 56 -webkit-margin-start: var(--checkbox-spacing); |
| 54 } | 57 } |
| 55 </style> | 58 </style> |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 disabled="[[metricsReporting_.managed]]"> | 103 disabled="[[metricsReporting_.managed]]"> |
| 101 $i18n{enableLogging} | 104 $i18n{enableLogging} |
| 102 </paper-checkbox> | 105 </paper-checkbox> |
| 103 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> | 106 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> |
| 104 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> | 107 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> |
| 105 <paper-tooltip for="indicator" position="top" | 108 <paper-tooltip for="indicator" position="top" |
| 106 fit-to-visible-bounds> | 109 fit-to-visible-bounds> |
| 107 $i18n{controlledSettingPolicy} | 110 $i18n{controlledSettingPolicy} |
| 108 </paper-tooltip> | 111 </paper-tooltip> |
| 109 </template> | 112 </template> |
| 113 <template is="dom-if" if="[[showRestart_]]" restamp> |
| 114 <paper-button on-tap="onRestartTap_">$i18n{restart}</paper-button> |
| 115 </template> |
| 110 </div> | 116 </div> |
| 111 </if><!-- not chromeos --> | 117 </if><!-- not chromeos --> |
| 112 </if><!-- _google_chrome --> | 118 </if><!-- _google_chrome --> |
| 113 <settings-checkbox pref="{{prefs.enable_do_not_track}}" | 119 <settings-checkbox pref="{{prefs.enable_do_not_track}}" |
| 114 label="$i18n{doNotTrack}"> | 120 label="$i18n{doNotTrack}"> |
| 115 </settings-checkbox> | 121 </settings-checkbox> |
| 116 <if expr="chromeos"> | 122 <if expr="chromeos"> |
| 117 <settings-checkbox | 123 <settings-checkbox |
| 118 pref="{{prefs.cros.device.attestation_for_content_protection_enabl
ed}}" | 124 pref="{{prefs.cros.device.attestation_for_content_protection_enabl
ed}}" |
| 119 label="$i18n{enableContentProtectionAttestation}"> | 125 label="$i18n{enableContentProtectionAttestation}"> |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 </template> | 352 </template> |
| 347 <template is="dom-if" route-path="/content/siteDetails" no-search> | 353 <template is="dom-if" route-path="/content/siteDetails" no-search> |
| 348 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}"> | 354 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}"> |
| 349 <site-details site="[[selectedSite]]"></site-details> | 355 <site-details site="[[selectedSite]]"></site-details> |
| 350 </settings-subpage> | 356 </settings-subpage> |
| 351 </template> | 357 </template> |
| 352 </settings-animated-pages> | 358 </settings-animated-pages> |
| 353 </template> | 359 </template> |
| 354 <script src="privacy_page.js"></script> | 360 <script src="privacy_page.js"></script> |
| 355 </dom-module> | 361 </dom-module> |
| OLD | NEW |