Chromium Code Reviews| 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 <if expr="use_nss_certs"> | |
| 5 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.html"> | 6 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.html"> |
| 7 </if> | |
| 6 <link rel="import" href="chrome://md-settings/clear_browsing_data_dialog/clear_b rowsing_data_dialog.html"> | 8 <link rel="import" href="chrome://md-settings/clear_browsing_data_dialog/clear_b rowsing_data_dialog.html"> |
| 7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> | 9 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> |
| 8 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> | 10 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> |
| 9 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> | 11 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> |
| 10 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 12 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
| 11 <link rel="import" href="chrome://md-settings/site_settings/all_sites.html"> | 13 <link rel="import" href="chrome://md-settings/site_settings/all_sites.html"> |
| 12 <link rel="import" href="chrome://md-settings/site_settings/constants.html"> | 14 <link rel="import" href="chrome://md-settings/site_settings/constants.html"> |
| 13 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_p age.html"> | 15 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_p age.html"> |
| 14 | 16 |
| 15 <dom-module id="settings-privacy-page"> | 17 <dom-module id="settings-privacy-page"> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 <settings-checkbox | 66 <settings-checkbox |
| 65 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}" | 67 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}" |
| 66 i18n-values="label:enableContentProtectionAttestation"> | 68 i18n-values="label:enableContentProtectionAttestation"> |
| 67 </settings-checkbox> | 69 </settings-checkbox> |
| 68 <settings-checkbox | 70 <settings-checkbox |
| 69 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" | 71 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" |
| 70 i18n-values="label:wakeOnWifi"> | 72 i18n-values="label:wakeOnWifi"> |
| 71 </settings-checkbox> | 73 </settings-checkbox> |
| 72 </if> | 74 </if> |
| 73 </div> | 75 </div> |
| 74 <div class="settings-box two-line" on-tap="onManageCertificatesTap_"> | 76 <div class="settings-box two-line" |
| 77 <if expr="use_nss_certs"> | |
| 78 on-tap="onManageCertificatesWebUiTap_"> | |
| 79 </if> | |
| 80 <if expr="not use_nss_certs"> | |
| 81 on-tap="onManageCertificatesNativeTap_"> | |
| 82 </if> | |
|
Dan Beam
2016/03/25 02:21:18
can you just do this in the javascript instead?
dpapad
2016/03/25 16:56:55
Done.
| |
| 75 <div class="start"> | 83 <div class="start"> |
| 76 <div i18n-content="manageCertificates"></div> | 84 <div i18n-content="manageCertificates"></div> |
| 77 <div class="secondary"> | 85 <div class="secondary"> |
| 78 <!-- TODO(dschuyler): replace this placeholder text --> | 86 <!-- TODO(dschuyler): replace this placeholder text --> |
| 79 Contrary to popular belief, Lorem Ipsum is not simply random text. | 87 Contrary to popular belief, Lorem Ipsum is not simply random text. |
| 80 </div> | 88 </div> |
| 81 </div> | 89 </div> |
| 82 </div> | 90 </div> |
| 83 <div class="settings-box two-line" on-tap="onSiteSettingsTap_"> | 91 <div class="settings-box two-line" on-tap="onSiteSettingsTap_"> |
| 84 <div class="start"> | 92 <div class="start"> |
| 85 <div i18n-content="siteSettings"></div> | 93 <div i18n-content="siteSettings"></div> |
| 86 <div class="secondary"> | 94 <div class="secondary"> |
| 87 <!-- TODO(dschuyler): replace this placeholder text --> | 95 <!-- TODO(dschuyler): replace this placeholder text --> |
| 88 Contrary to popular belief, Lorem Ipsum is not simply random text. | 96 Contrary to popular belief, Lorem Ipsum is not simply random text. |
| 89 </div> | 97 </div> |
| 90 </div> | 98 </div> |
| 91 </div> | 99 </div> |
| 92 <div class="settings-box"> | 100 <div class="settings-box"> |
| 93 <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button" | 101 <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button" |
| 94 i18n-content="clearBrowsingData"> | 102 i18n-content="clearBrowsingData"> |
| 95 </paper-button> | 103 </paper-button> |
| 96 </div> | 104 </div> |
| 97 </neon-animatable> | 105 </neon-animatable> |
| 106 <if expr="use_nss_certs"> | |
| 98 <neon-animatable id="manage-certificates"> | 107 <neon-animatable id="manage-certificates"> |
| 99 <settings-subheader i18n-values="page-title:manageCertificates"> | 108 <settings-subheader i18n-values="page-title:manageCertificates"> |
| 100 </settings-subheader> | 109 </settings-subheader> |
| 101 <settings-certificate-manager-page> | 110 <settings-certificate-manager-page> |
| 102 </settings-certificate-manager-page> | 111 </settings-certificate-manager-page> |
| 103 </neon-animatable> | 112 </neon-animatable> |
| 113 </if> | |
| 104 <neon-animatable id="site-settings"> | 114 <neon-animatable id="site-settings"> |
| 105 <settings-subheader i18n-values="page-title:siteSettings"> | 115 <settings-subheader i18n-values="page-title:siteSettings"> |
| 106 </settings-subheader> | 116 </settings-subheader> |
| 107 <settings-site-settings-page current-route="{{currentRoute}}" | 117 <settings-site-settings-page current-route="{{currentRoute}}" |
| 108 prefs="{{prefs}}" category-selected="{{categorySelected}}"> | 118 prefs="{{prefs}}" category-selected="{{categorySelected}}"> |
| 109 </settings-site-settings-page> | 119 </settings-site-settings-page> |
| 110 </neon-animatable> | 120 </neon-animatable> |
| 111 | 121 |
| 112 <neon-animatable id="all-sites"> | 122 <neon-animatable id="all-sites"> |
| 113 <settings-subheader | 123 <settings-subheader |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 210 <neon-animatable id="site-details"> | 220 <neon-animatable id="site-details"> |
| 211 <site-details prefs="{{prefs}}" origin="{{originSelected}}" | 221 <site-details prefs="{{prefs}}" origin="{{originSelected}}" |
| 212 current-route="{{currentRoute}}" | 222 current-route="{{currentRoute}}" |
| 213 category-selected="{{categorySelected}}"> | 223 category-selected="{{categorySelected}}"> |
| 214 </site-details> | 224 </site-details> |
| 215 </neon-animatable> | 225 </neon-animatable> |
| 216 </settings-animated-pages> | 226 </settings-animated-pages> |
| 217 </template> | 227 </template> |
| 218 <script src="privacy_page.js"></script> | 228 <script src="privacy_page.js"></script> |
| 219 </dom-module> | 229 </dom-module> |
| OLD | NEW |