| 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/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 5 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog.
html"> | 5 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog.
html"> |
| 6 <link rel="import" href="/controls/settings_checkbox.html"> | 6 <link rel="import" href="/controls/settings_checkbox.html"> |
| 7 <link rel="import" href="/settings_main/settings_main_rendered.html"> | 7 <link rel="import" href="/settings_main/settings_main_rendered.html"> |
| 8 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 8 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 9 <link rel="import" href="/settings_page/settings_subpage.html"> | 9 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 10 <link rel="import" href="/settings_shared_css.html"> | 10 <link rel="import" href="/settings_shared_css.html"> |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 pref="{{prefs.cros.device.attestation_for_content_protection_enabl
ed}}" | 77 pref="{{prefs.cros.device.attestation_for_content_protection_enabl
ed}}" |
| 78 label="$i18n{enableContentProtectionAttestation}"> | 78 label="$i18n{enableContentProtectionAttestation}"> |
| 79 </settings-checkbox> | 79 </settings-checkbox> |
| 80 <settings-checkbox | 80 <settings-checkbox |
| 81 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" | 81 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" |
| 82 label="$i18n{wakeOnWifi}"> | 82 label="$i18n{wakeOnWifi}"> |
| 83 </settings-checkbox> | 83 </settings-checkbox> |
| 84 </if> | 84 </if> |
| 85 </div> | 85 </div> |
| 86 <if expr="use_nss_certs or is_win or is_macosx"> | 86 <if expr="use_nss_certs or is_win or is_macosx"> |
| 87 <div id="manageCertificates" class="settings-box two-line" actionable | 87 <div id="manageCertificates" class="settings-box two-line single-column" |
| 88 on-tap="onManageCertificatesTap_"> | 88 actionable on-tap="onManageCertificatesTap_"> |
| 89 <div class="start"> | 89 <div>$i18n{manageCertificates}</div> |
| 90 <div>$i18n{manageCertificates}</div> | 90 <div class="secondary">$i18n{manageCertificatesDescription}</div> |
| 91 <div class="secondary">$i18n{manageCertificatesDescription}</div> | |
| 92 </div> | |
| 93 </div> | 91 </div> |
| 94 </if> | 92 </if> |
| 95 <div class="settings-box two-line" on-tap="onSiteSettingsTap_" | 93 <div class="settings-box two-line single-column" actionable |
| 96 actionable> | 94 on-tap="onSiteSettingsTap_"> |
| 97 <div class="start"> | 95 <div>$i18n{siteSettings}</div> |
| 98 <div>$i18n{siteSettings}</div> | 96 <div class="secondary">$i18n{siteSettingsDescription}</div> |
| 99 <div class="secondary">$i18n{siteSettingsDescription}</div> | |
| 100 </div> | |
| 101 </div> | 97 </div> |
| 102 <div class="settings-box"> | 98 <div class="settings-box"> |
| 103 <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button"> | 99 <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button"> |
| 104 $i18n{clearBrowsingData} | 100 $i18n{clearBrowsingData} |
| 105 </paper-button> | 101 </paper-button> |
| 106 </div> | 102 </div> |
| 107 </neon-animatable> | 103 </neon-animatable> |
| 108 <if expr="use_nss_certs"> | 104 <if expr="use_nss_certs"> |
| 109 <template is="dom-if" name="manage-certificates"> | 105 <template is="dom-if" name="manage-certificates"> |
| 110 <settings-subpage page-title="$i18n{manageCertificates}"> | 106 <settings-subpage page-title="$i18n{manageCertificates}"> |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 <template is="dom-if" name="site-details"> | 265 <template is="dom-if" name="site-details"> |
| 270 <settings-subpage | 266 <settings-subpage |
| 271 page-title="$i18n{siteSettingsSiteDetailsPageTitle}"> | 267 page-title="$i18n{siteSettingsSiteDetailsPageTitle}"> |
| 272 <site-details site="[[selectedSite]]"></site-details> | 268 <site-details site="[[selectedSite]]"></site-details> |
| 273 </settings-subpage> | 269 </settings-subpage> |
| 274 </template> | 270 </template> |
| 275 </settings-animated-pages> | 271 </settings-animated-pages> |
| 276 </template> | 272 </template> |
| 277 <script src="privacy_page.js"></script> | 273 <script src="privacy_page.js"></script> |
| 278 </dom-module> | 274 </dom-module> |
| OLD | NEW |