Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <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"> | 3 <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"> | 4 <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"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 5 <if expr="use_nss_certs"> | 6 <if expr="use_nss_certs"> |
| 6 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.html"> | 7 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.html"> |
| 7 </if> | 8 </if> |
| 8 <link rel="import" href="chrome://md-settings/clear_browsing_data_dialog/clear_b rowsing_data_dialog.html"> | 9 <link rel="import" href="chrome://md-settings/clear_browsing_data_dialog/clear_b rowsing_data_dialog.html"> |
| 9 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> | 10 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> |
| 10 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> | 11 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> |
| 11 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> | 12 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l"> |
| 12 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 13 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
| 13 <link rel="import" href="chrome://md-settings/site_settings/all_sites.html"> | 14 <link rel="import" href="chrome://md-settings/site_settings/all_sites.html"> |
| 14 <link rel="import" href="chrome://md-settings/site_settings/constants.html"> | 15 <link rel="import" href="chrome://md-settings/site_settings/constants.html"> |
| 15 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_p age.html"> | 16 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_p age.html"> |
| 16 | 17 |
| 17 <dom-module id="settings-privacy-page"> | 18 <dom-module id="settings-privacy-page"> |
| 18 <link rel="import" type="css" href="privacy_page.css"> | 19 <link rel="import" type="css" href="privacy_page.css"> |
| 19 <template> | 20 <template> |
| 20 <style include="settings-shared"></style> | 21 <style include="settings-shared"></style> |
| 21 <settings-animated-pages id="pages" current-route="{{currentRoute}}" | 22 <settings-animated-pages id="pages" current-route="{{currentRoute}}" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 91 </div> | 92 </div> |
| 92 </div> | 93 </div> |
| 93 </div> | 94 </div> |
| 94 <div class="settings-box"> | 95 <div class="settings-box"> |
| 95 <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button" | 96 <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button" |
| 96 i18n-content="clearBrowsingData"> | 97 i18n-content="clearBrowsingData"> |
| 97 </paper-button> | 98 </paper-button> |
| 98 </div> | 99 </div> |
| 99 </neon-animatable> | 100 </neon-animatable> |
| 100 <if expr="use_nss_certs"> | 101 <if expr="use_nss_certs"> |
| 101 <neon-animatable id="manage-certificates"> | 102 <template is="dom-if" name="manage-certificates"> |
| 102 <settings-subheader i18n-values="page-title:manageCertificates"> | 103 <settings-subpage page-title="[[i18n('manageCertificates')]]"> |
| 103 </settings-subheader> | 104 <settings-certificate-manager-page> |
| 104 <settings-certificate-manager-page> | 105 </settings-certificate-manager-page> |
| 105 </settings-certificate-manager-page> | 106 </settings-subpage> |
| 106 </neon-animatable> | 107 </template> |
| 107 </if> | 108 </if> |
| 108 <neon-animatable id="site-settings"> | 109 <template is="dom-if" name="site-settings"> |
| 109 <settings-subheader i18n-values="page-title:siteSettings"> | 110 <settings-subpage id="site-settings" |
| 110 </settings-subheader> | 111 page-title="[[i18n('siteSettings')]]"> |
| 111 <settings-site-settings-page current-route="{{currentRoute}}" | 112 <settings-site-settings-page current-route="{{currentRoute}}" |
| 112 category-selected="{{categorySelected}}"> | 113 category-selected="{{categorySelected}}"> |
| 113 </settings-site-settings-page> | 114 </settings-site-settings-page> |
| 114 </neon-animatable> | 115 </settings-subpage> |
| 116 </template> | |
| 115 | 117 |
| 116 <neon-animatable id="all-sites"> | 118 <template is="dom-if" name="all-sites"> |
| 117 <settings-subheader | 119 <settings-subpage page-title="[[i18n('siteSettingsCategoryAllSites')]]"> |
| 118 i18n-values="page-title:siteSettingsCategoryAllSites"> | 120 <all-sites |
| 119 </settings-subheader> | 121 selected-site="{{selectedSite}}" |
| 120 <all-sites | 122 current-route="{{currentRoute}}"> |
| 121 selected-site="{{selectedSite}}" | 123 </all-sites> |
| 122 current-route="{{currentRoute}}"> | 124 </settings-subpage> |
| 123 </all-sites> | 125 </template> |
| 124 </neon-animatable> | 126 <template is="dom-if" name="site-settings-category-camera"> |
| 125 <neon-animatable id="site-settings-category-camera"> | 127 <settings-subpage page-title="[[i18n('siteSettingsCategoryCamera')]]"> |
| 126 <settings-subheader i18n-values="page-title:siteSettingsCategoryCamera"> | 128 <site-settings-category |
| 127 </settings-subheader> | 129 selected-site="{{selectedSite}}" |
| 128 <site-settings-category | 130 current-route="{{currentRoute}}" |
| 129 selected-site="{{selectedSite}}" | 131 category="{{ContentSettingsTypes.CAMERA}}"> |
| 130 current-route="{{currentRoute}}" | 132 </site-settings-category> |
| 131 category="{{ContentSettingsTypes.CAMERA}}"> | 133 </settings-subpage> |
| 132 </site-settings-category> | 134 </template> |
| 133 </neon-animatable> | 135 <template is="dom-if" name="site-settings-category-cookies"> |
| 134 <neon-animatable id="site-settings-category-cookies"> | 136 <settings-subpage page-title="[[i18n('siteSettingsCategoryCookies')]]"> |
| 135 <settings-subheader | 137 <site-settings-category |
| 136 i18n-values="page-title:siteSettingsCategoryCookies"> | 138 selected-site="{{selectedSite}}" |
| 137 </settings-subheader> | 139 current-route="{{currentRoute}}" |
| 138 <site-settings-category | 140 category="{{ContentSettingsTypes.COOKIES}}"> |
| 139 selected-site="{{selectedSite}}" | 141 </site-settings-category> |
| 140 current-route="{{currentRoute}}" | 142 </settings-subpage> |
| 141 category="{{ContentSettingsTypes.COOKIES}}"> | 143 </template> |
| 142 </site-settings-category> | 144 <template is="dom-if" name="site-settings-category-fullscreen"> |
| 143 </neon-animatable> | 145 <settings-subpage |
| 144 <neon-animatable id="site-settings-category-fullscreen"> | 146 page-title="[[i18n('siteSettingsCategoryFullscreen')]]"> |
| 145 <settings-subheader | 147 <site-settings-category |
| 146 i18n-values="page-title:siteSettingsCategoryFullscreen"> | 148 selected-site="{{selectedSite}}" |
| 147 </settings-subheader> | 149 current-route="{{currentRoute}}" |
| 148 <site-settings-category | 150 category="{{ContentSettingsTypes.FULLSCREEN}}"> |
| 149 selected-site="{{selectedSite}}" | 151 </site-settings-category> |
| 150 current-route="{{currentRoute}}" | 152 </settings-subpage> |
| 151 category="{{ContentSettingsTypes.FULLSCREEN}}"> | 153 </template> |
| 152 </site-settings-category> | 154 <template is="dom-if" name="site-settings-category-images"> |
| 153 </neon-animatable> | 155 <settings-subpage page-title="[[i18n('siteSettingsCategoryImages')]]"> |
| 154 <neon-animatable id="site-settings-category-images"> | 156 <site-settings-category |
| 155 <settings-subheader i18n-values="page-title:siteSettingsCategoryImages"> | 157 selected-site="{{selectedSite}}" |
| 156 </settings-subheader> | 158 current-route="{{currentRoute}}" |
| 157 <site-settings-category | 159 category="{{ContentSettingsTypes.IMAGES}}"> |
| 158 selected-site="{{selectedSite}}" | 160 </site-settings-category> |
| 159 current-route="{{currentRoute}}" | 161 </settings-subpage> |
| 160 category="{{ContentSettingsTypes.IMAGES}}"> | 162 </template> |
| 161 </site-settings-category> | 163 <template is="dom-if" name="site-settings-category-location"> |
| 162 </neon-animatable> | 164 <settings-subpage page-title="[[i18n('siteSettingsCategoryLocation')]]"> |
| 163 <neon-animatable id="site-settings-category-location"> | 165 <site-settings-category |
| 164 <settings-subheader | 166 selected-site="{{selectedSite}}" |
| 165 i18n-values="page-title:siteSettingsCategoryLocation"> | 167 current-route="{{currentRoute}}" |
| 166 </settings-subheader> | 168 category="{{ContentSettingsTypes.GEOLOCATION}}"> |
| 167 <site-settings-category | 169 </site-settings-category> |
| 168 selected-site="{{selectedSite}}" | 170 </settings-subpage> |
| 169 current-route="{{currentRoute}}" | 171 </template> |
| 170 category="{{ContentSettingsTypes.GEOLOCATION}}"> | 172 <template is="dom-if" name="site-settings-category-javascript"> |
| 171 </site-settings-category> | 173 <settings-subpage |
| 172 </neon-animatable> | 174 page-title="[[i18n('siteSettingsCategoryJavascript')]]"> |
| 173 <neon-animatable id="site-settings-category-javascript"> | 175 <site-settings-category |
| 174 <settings-subheader | 176 selected-site="{{selectedSite}}" |
| 175 i18n-values="page-title:siteSettingsCategoryJavascript"> | 177 current-route="{{currentRoute}}" |
| 176 </settings-subheader> | 178 category="{{ContentSettingsTypes.JAVASCRIPT}}"> |
| 177 <site-settings-category | 179 </site-settings-category> |
| 178 selected-site="{{selectedSite}}" | 180 </settings-subpage> |
| 179 current-route="{{currentRoute}}" | 181 </template> |
| 180 category="{{ContentSettingsTypes.JAVASCRIPT}}"> | 182 <template is="dom-if" name="site-settings-category-microphone"> |
| 181 </site-settings-category> | 183 <settings-subpage |
| 182 </neon-animatable> | 184 page-title="[[i18n('siteSettingsCategoryMicrophone')]]"> |
| 183 <neon-animatable id="site-settings-category-microphone"> | 185 <site-settings-category |
| 184 <settings-subheader | 186 selected-site="{{selectedSite}}" |
| 185 i18n-values="page-title:siteSettingsCategoryMicrophone"> | 187 current-route="{{currentRoute}}" |
| 186 </settings-subheader> | 188 category="{{ContentSettingsTypes.MIC}}"> |
| 187 <site-settings-category | 189 </site-settings-category> |
| 188 selected-site="{{selectedSite}}" | 190 </settings-subpage> |
| 189 current-route="{{currentRoute}}" | 191 </template> |
| 190 category="{{ContentSettingsTypes.MIC}}"> | 192 <template is="dom-if" name="site-settings-category-notifications"> |
| 191 </site-settings-category> | 193 <settings-subpage |
| 192 </neon-animatable> | 194 page-title="[[i18n('siteSettingsCategoryNotifications')]]"> |
| 193 <neon-animatable id="site-settings-category-notifications"> | 195 <site-settings-category |
| 194 <settings-subheader | 196 selected-site="{{selectedSite}}" |
| 195 i18n-values="page-title:siteSettingsCategoryNotifications"> | 197 current-route="{{currentRoute}}" |
| 196 </settings-subheader> | 198 category="{{ContentSettingsTypes.NOTIFICATIONS}}"> |
| 197 <site-settings-category | 199 </site-settings-category> |
| 198 selected-site="{{selectedSite}}" | 200 </settings-subpage> |
| 199 current-route="{{currentRoute}}" | 201 </template> |
| 200 category="{{ContentSettingsTypes.NOTIFICATIONS}}"> | 202 <template is="dom-if" name="site-settings-category-popups"> |
| 201 </site-settings-category> | 203 <settings-subpage page-title="[[i18n('siteSettingsCategoryPopups')]]"> |
| 202 </neon-animatable> | 204 <site-settings-category |
| 203 <neon-animatable id="site-settings-category-popups"> | 205 selected-site="{{selectedSite}}" |
| 204 <settings-subheader | 206 current-route="{{currentRoute}}" |
| 205 i18n-values="page-title:siteSettingsCategoryPopups"> | 207 category="{{ContentSettingsTypes.POPUPS}}"> |
| 206 </settings-subheader> | 208 </site-settings-category> |
| 207 <site-settings-category | 209 </settings-subpage> |
| 208 selected-site="{{selectedSite}}" | 210 </template> |
| 209 current-route="{{currentRoute}}" | |
| 210 category="{{ContentSettingsTypes.POPUPS}}"> | |
| 211 </site-settings-category> | |
| 212 </neon-animatable> | |
| 213 | 211 |
| 212 <!-- TODO(michaelpg): confirm this is a bug, and switch to | |
| 213 settings-subpage (crbug.com/597314). --> | |
| 214 <neon-animatable id="site-details"> | 214 <neon-animatable id="site-details"> |
| 215 <site-details | 215 <site-details |
| 216 site="{{selectedSite}}" | 216 site="{{selectedSite}}" |
| 217 current-route="{{currentRoute}}"> | 217 current-route="{{currentRoute}}"> |
| 218 </site-details> | 218 </site-details> |
| 219 </neon-animatable> | 219 </template> |
|
Dan Beam
2016/03/30 03:44:27
wat
michaelpg
2016/03/30 22:48:03
good catch, done
| |
| 220 </settings-animated-pages> | 220 </settings-animated-pages> |
| 221 </template> | 221 </template> |
| 222 <script src="privacy_page.js"></script> | 222 <script src="privacy_page.js"></script> |
| 223 </dom-module> | 223 </dom-module> |
| OLD | NEW |