| 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="/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="/route.html"> | 10 <link rel="import" href="/route.html"> |
| 10 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 11 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 11 <link rel="import" href="/settings_page/settings_subpage.html"> | 12 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 12 <link rel="import" href="/settings_shared_css.html"> | 13 <link rel="import" href="/settings_shared_css.html"> |
| 13 <link rel="import" href="/site_settings/all_sites.html"> | 14 <link rel="import" href="/site_settings/all_sites.html"> |
| 14 <link rel="import" href="/site_settings/constants.html"> | 15 <link rel="import" href="/site_settings/constants.html"> |
| 15 <link rel="import" href="/site_settings/media_picker.html"> | 16 <link rel="import" href="/site_settings/media_picker.html"> |
| 16 <link rel="import" href="/site_settings/protocol_handlers.html"> | 17 <link rel="import" href="/site_settings/protocol_handlers.html"> |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 pref="{{prefs.cros.device.attestation_for_content_protection_enabl
ed}}" | 117 pref="{{prefs.cros.device.attestation_for_content_protection_enabl
ed}}" |
| 117 label="$i18n{enableContentProtectionAttestation}"> | 118 label="$i18n{enableContentProtectionAttestation}"> |
| 118 </settings-checkbox> | 119 </settings-checkbox> |
| 119 <settings-checkbox | 120 <settings-checkbox |
| 120 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" | 121 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" |
| 121 label="$i18n{wakeOnWifi}"> | 122 label="$i18n{wakeOnWifi}"> |
| 122 </settings-checkbox> | 123 </settings-checkbox> |
| 123 </if> | 124 </if> |
| 124 </div> | 125 </div> |
| 125 <if expr="use_nss_certs or is_win or is_macosx"> | 126 <if expr="use_nss_certs or is_win or is_macosx"> |
| 126 <div id="manageCertificates" class="settings-box two-line single-column" | 127 <div id="manageCertificates" class="settings-box two-line" |
| 127 actionable on-tap="onManageCertificatesTap_"> | 128 actionable on-tap="onManageCertificatesTap_"> |
| 128 <div>$i18n{manageCertificates}</div> | 129 <div class="start"> |
| 129 <div class="secondary">$i18n{manageCertificatesDescription}</div> | 130 <div>$i18n{manageCertificates}</div> |
| 131 <div class="secondary">$i18n{manageCertificatesDescription}</div> |
| 132 </div> |
| 133 <button class="icon-arrow-right" is="paper-icon-button-light"> |
| 134 </button> |
| 130 </div> | 135 </div> |
| 131 </if> | 136 </if> |
| 132 <div id="site-settings-subpage-trigger" | 137 <div id="site-settings-subpage-trigger" |
| 133 class="settings-box two-line single-column" actionable | 138 class="settings-box two-line" actionable |
| 134 on-tap="onSiteSettingsTap_"> | 139 on-tap="onSiteSettingsTap_"> |
| 135 <div>$i18n{siteSettings}</div> | 140 <div class="start"> |
| 136 <div class="secondary">$i18n{siteSettingsDescription}</div> | 141 <div>$i18n{siteSettings}</div> |
| 142 <div class="secondary">$i18n{siteSettingsDescription}</div> |
| 143 </div> |
| 144 <button class="icon-arrow-right" is="paper-icon-button-light"> |
| 145 </button> |
| 137 </div> | 146 </div> |
| 138 <div class="settings-box"> | 147 <div class="settings-box two-line" id="clearBrowsingData" |
| 139 <paper-button id="clearBrowsingData" | 148 on-tap="onClearBrowsingDataTap_" actionable> |
| 140 on-tap="onClearBrowsingDataTap_" class="primary-button"> | 149 <div class="start"> |
| 141 $i18n{clearBrowsingData} | 150 $i18n{clearBrowsingData} |
| 142 </paper-button> | 151 <div class="secondary">$i18n{clearBrowsingDataSubtext}</div> |
| 152 </div> |
| 153 <button class="icon-arrow-right" is="paper-icon-button-light"> |
| 154 </button> |
| 143 </div> | 155 </div> |
| 144 </neon-animatable> | 156 </neon-animatable> |
| 145 <if expr="use_nss_certs"> | 157 <if expr="use_nss_certs"> |
| 146 <template is="dom-if" route-path="/certificates"> | 158 <template is="dom-if" route-path="/certificates"> |
| 147 <settings-subpage | 159 <settings-subpage |
| 148 associated-control="[[$$('#manageCertificates')]]" | 160 associated-control="[[$$('#manageCertificates')]]" |
| 149 page-title="$i18n{manageCertificates}"> | 161 page-title="$i18n{manageCertificates}"> |
| 150 <settings-certificate-manager-page> | 162 <settings-certificate-manager-page> |
| 151 </settings-certificate-manager-page> | 163 </settings-certificate-manager-page> |
| 152 </settings-subpage> | 164 </settings-subpage> |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 </template> | 312 </template> |
| 301 <template is="dom-if" route-path="/siteSettings/siteDetails" no-search> | 313 <template is="dom-if" route-path="/siteSettings/siteDetails" no-search> |
| 302 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}"> | 314 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}"> |
| 303 <site-details site="[[selectedSite]]"></site-details> | 315 <site-details site="[[selectedSite]]"></site-details> |
| 304 </settings-subpage> | 316 </settings-subpage> |
| 305 </template> | 317 </template> |
| 306 </settings-animated-pages> | 318 </settings-animated-pages> |
| 307 </template> | 319 </template> |
| 308 <script src="privacy_page.js"></script> | 320 <script src="privacy_page.js"></script> |
| 309 </dom-module> | 321 </dom-module> |
| OLD | NEW |