| 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_toggle_button.html"> | 9 <link rel="import" href="/controls/settings_toggle_button.html"> |
| 10 <link rel="import" href="/lifetime_browser_proxy.html"> | 10 <link rel="import" href="/lifetime_browser_proxy.html"> |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 } | 38 } |
| 39 | 39 |
| 40 .settings-row-min-height { | 40 .settings-row-min-height { |
| 41 min-height: var(--settings-row-min-height); | 41 min-height: var(--settings-row-min-height); |
| 42 } | 42 } |
| 43 | 43 |
| 44 #metricsReporting paper-tooltip { | 44 #metricsReporting paper-tooltip { |
| 45 --paper-tooltip: var(--cr-policy-tooltip); | 45 --paper-tooltip: var(--cr-policy-tooltip); |
| 46 } | 46 } |
| 47 | 47 |
| 48 #indicator { | 48 #metricsReportingControl, |
| 49 #indicator, |
| 50 #restart { |
| 49 -webkit-margin-start: var(--checkbox-spacing); | 51 -webkit-margin-start: var(--checkbox-spacing); |
| 50 } | 52 } |
| 51 | |
| 52 #restart { | |
| 53 text-align: end; | |
| 54 } | |
| 55 </style> | 53 </style> |
| 56 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> | 54 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> |
| 57 <settings-clear-browsing-data-dialog prefs="{{prefs}}" | 55 <settings-clear-browsing-data-dialog prefs="{{prefs}}" |
| 58 on-close="onDialogClosed_"> | 56 on-close="onDialogClosed_"> |
| 59 </settings-clear-browsing-data-dialog> | 57 </settings-clear-browsing-data-dialog> |
| 60 </template> | 58 </template> |
| 61 <settings-animated-pages id="pages" section="privacy"> | 59 <settings-animated-pages id="pages" section="privacy"> |
| 62 <neon-animatable route-path="default"> | 60 <neon-animatable route-path="default"> |
| 63 <div class="settings-box block first"> | 61 <div class="settings-box block first"> |
| 64 <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p> | 62 <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p> |
| (...skipping 26 matching lines...) Expand all Loading... |
| 91 <if expr="chromeos"> | 89 <if expr="chromeos"> |
| 92 <settings-toggle-button | 90 <settings-toggle-button |
| 93 pref="{{prefs.cros.metrics.reportingEnabled}}" | 91 pref="{{prefs.cros.metrics.reportingEnabled}}" |
| 94 label="$i18n{enableLogging}"> | 92 label="$i18n{enableLogging}"> |
| 95 </settings-toggle-button> | 93 </settings-toggle-button> |
| 96 </if><!-- chromeos --> | 94 </if><!-- chromeos --> |
| 97 <if expr="not chromeos"> | 95 <if expr="not chromeos"> |
| 98 <div class="layout horizontal center settings-row-min-height"> | 96 <div class="layout horizontal center settings-row-min-height"> |
| 99 <div class="flex">$i18n{enableLogging}</div> | 97 <div class="flex">$i18n{enableLogging}</div> |
| 100 <template is="dom-if" if="[[showRestart_]]" restamp> | 98 <template is="dom-if" if="[[showRestart_]]" restamp> |
| 101 <div id="restart" class="flex"> | 99 <paper-button on-tap="onRestartTap_" id="restart"> |
| 102 <paper-button on-tap="onRestartTap_"> | 100 $i18n{restart} |
| 103 $i18n{restart} | 101 </paper-button> |
| 104 </paper-button> | |
| 105 </div> | |
| 106 </template> | 102 </template> |
| 107 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> | 103 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> |
| 108 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> | 104 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> |
| 109 <paper-tooltip for="indicator" position="top" | 105 <paper-tooltip for="indicator" position="top" |
| 110 fit-to-visible-bounds> | 106 fit-to-visible-bounds> |
| 111 $i18n{controlledSettingPolicy} | 107 $i18n{controlledSettingPolicy} |
| 112 </paper-tooltip> | 108 </paper-tooltip> |
| 113 </template> | 109 </template> |
| 114 <paper-toggle-button id="metricsReportingControl" | 110 <paper-toggle-button id="metricsReportingControl" |
| 115 on-tap="onMetricsReportingControlTap_" | 111 on-tap="onMetricsReportingControlTap_" |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 389 $i18n{siteSettingsCookieRemoveAll} | 385 $i18n{siteSettingsCookieRemoveAll} |
| 390 </paper-button> | 386 </paper-button> |
| 391 <site-data-details-subpage page-title="{{pageTitle}}"> | 387 <site-data-details-subpage page-title="{{pageTitle}}"> |
| 392 </site-data-details-subpage> | 388 </site-data-details-subpage> |
| 393 </settings-subpage> | 389 </settings-subpage> |
| 394 </template> | 390 </template> |
| 395 </settings-animated-pages> | 391 </settings-animated-pages> |
| 396 </template> | 392 </template> |
| 397 <script src="privacy_page.js"></script> | 393 <script src="privacy_page.js"></script> |
| 398 </dom-module> | 394 </dom-module> |
| OLD | NEW |