Chromium Code Reviews| 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-icon-button/paper -icon-button-light.html"> | 6 <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"> | 7 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html"> |
| 8 <link rel="import" href="/controls/settings_checkbox.html"> | 8 <link rel="import" href="/controls/settings_checkbox.html"> |
| 9 <link rel="import" href="/route.html"> | 9 <link rel="import" href="/route.html"> |
| 10 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 10 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 179 </template> | 179 </template> |
| 180 | 180 |
| 181 <template is="dom-if" route-path="/siteSettings/all" no-search> | 181 <template is="dom-if" route-path="/siteSettings/all" no-search> |
| 182 <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}"> | 182 <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}"> |
| 183 <all-sites selected-site="{{selectedSite}}"></all-sites> | 183 <all-sites selected-site="{{selectedSite}}"></all-sites> |
| 184 </settings-subpage> | 184 </settings-subpage> |
| 185 </template> | 185 </template> |
| 186 <template is="dom-if" route-path="/siteSettings/automaticDownloads" | 186 <template is="dom-if" route-path="/siteSettings/automaticDownloads" |
| 187 no-search> | 187 no-search> |
| 188 <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}"> | 188 <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}"> |
| 189 <button class="icon-help subpage-title-extra" | |
| 190 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
|
dschuyler
2016/10/20 23:27:46
dpapad@ and I discussed a few ways this button cou
| |
| 189 <site-settings-category | 191 <site-settings-category |
| 190 selected-site="{{selectedSite}}" | 192 selected-site="{{selectedSite}}" |
| 191 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}"> | 193 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}"> |
| 192 </site-settings-category> | 194 </site-settings-category> |
| 193 </settings-subpage> | 195 </settings-subpage> |
| 194 </template> | 196 </template> |
| 195 <template is="dom-if" route-path="/siteSettings/backgroundSync" no-search> | 197 <template is="dom-if" route-path="/siteSettings/backgroundSync" no-search> |
| 196 no-search> | 198 no-search> |
| 197 <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"> | 199 <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"> |
| 200 <button class="icon-help subpage-title-extra" | |
| 201 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 198 <site-settings-category | 202 <site-settings-category |
| 199 selected-site="{{selectedSite}}" | 203 selected-site="{{selectedSite}}" |
| 200 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> | 204 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> |
| 201 </site-settings-category> | 205 </site-settings-category> |
| 202 </settings-subpage> | 206 </settings-subpage> |
| 203 </template> | 207 </template> |
| 204 <template is="dom-if" route-path="/siteSettings/camera" no-search> | 208 <template is="dom-if" route-path="/siteSettings/camera" no-search> |
| 205 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> | 209 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> |
| 210 <button class="icon-help subpage-title-extra" | |
| 211 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 206 <site-settings-category | 212 <site-settings-category |
| 207 selected-site="{{selectedSite}}" | 213 selected-site="{{selectedSite}}" |
| 208 category="{{ContentSettingsTypes.CAMERA}}"> | 214 category="{{ContentSettingsTypes.CAMERA}}"> |
| 209 <media-picker type="camera" class="media-picker"></media-picker> | 215 <media-picker type="camera" class="media-picker"></media-picker> |
| 210 </site-settings-category> | 216 </site-settings-category> |
| 211 </settings-subpage> | 217 </settings-subpage> |
| 212 </template> | 218 </template> |
| 213 <template is="dom-if" route-path="/siteSettings/cookies" no-search> | 219 <template is="dom-if" route-path="/siteSettings/cookies" no-search> |
| 214 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}"> | 220 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}"> |
| 221 <button class="icon-help subpage-title-extra" | |
| 222 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 215 <site-settings-category | 223 <site-settings-category |
| 216 selected-site="{{selectedSite}}" | 224 selected-site="{{selectedSite}}" |
| 217 category="{{ContentSettingsTypes.COOKIES}}"> | 225 category="{{ContentSettingsTypes.COOKIES}}"> |
| 218 <div class="settings-box cookie-controls"> | 226 <div class="settings-box cookie-controls"> |
| 219 <settings-checkbox class="start" | 227 <settings-checkbox class="start" |
| 220 label="$i18n{thirdPartyCookie}" | 228 label="$i18n{thirdPartyCookie}" |
| 221 sub-label="$i18n{thirdPartyCookieSublabel}" | 229 sub-label="$i18n{thirdPartyCookieSublabel}" |
| 222 pref="{{prefs.profile.block_third_party_cookies}}"> | 230 pref="{{prefs.profile.block_third_party_cookies}}"> |
| 223 </settings-checkbox> | 231 </settings-checkbox> |
| 224 </div> | 232 </div> |
| 225 <site-data class="site-data"></site-data> | 233 <site-data class="site-data"></site-data> |
| 226 </site-settings-category> | 234 </site-settings-category> |
| 227 </settings-subpage> | 235 </settings-subpage> |
| 228 </template> | 236 </template> |
| 229 <template is="dom-if" route-path="/siteSettings/images" no-search> | 237 <template is="dom-if" route-path="/siteSettings/images" no-search> |
| 230 <settings-subpage page-title="$i18n{siteSettingsCategoryImages}"> | 238 <settings-subpage page-title="$i18n{siteSettingsCategoryImages}"> |
| 239 <button class="icon-help subpage-title-extra" | |
| 240 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 231 <site-settings-category | 241 <site-settings-category |
| 232 selected-site="{{selectedSite}}" | 242 selected-site="{{selectedSite}}" |
| 233 category="{{ContentSettingsTypes.IMAGES}}"> | 243 category="{{ContentSettingsTypes.IMAGES}}"> |
| 234 </site-settings-category> | 244 </site-settings-category> |
| 235 </settings-subpage> | 245 </settings-subpage> |
| 236 </template> | 246 </template> |
| 237 <template is="dom-if" route-path="/siteSettings/location" no-search> | 247 <template is="dom-if" route-path="/siteSettings/location" no-search> |
| 238 <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}"> | 248 <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}"> |
| 249 <button class="icon-help subpage-title-extra" | |
| 250 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 239 <site-settings-category | 251 <site-settings-category |
| 240 selected-site="{{selectedSite}}" | 252 selected-site="{{selectedSite}}" |
| 241 category="{{ContentSettingsTypes.GEOLOCATION}}"> | 253 category="{{ContentSettingsTypes.GEOLOCATION}}"> |
| 242 </site-settings-category> | 254 </site-settings-category> |
| 243 </settings-subpage> | 255 </settings-subpage> |
| 244 </template> | 256 </template> |
| 245 <template is="dom-if" route-path="/siteSettings/handlers" no-search> | 257 <template is="dom-if" route-path="/siteSettings/handlers" no-search> |
| 246 <settings-subpage page-title="$i18n{siteSettingsCategoryHandlers}"> | 258 <settings-subpage page-title="$i18n{siteSettingsCategoryHandlers}"> |
| 247 <protocol-handlers></protocol-handlers> | 259 <protocol-handlers></protocol-handlers> |
| 248 </settings-subpage> | 260 </settings-subpage> |
| 249 </template> | 261 </template> |
| 250 <template is="dom-if" route-path="/siteSettings/zoomLevels" no-search> | 262 <template is="dom-if" route-path="/siteSettings/zoomLevels" no-search> |
| 251 <settings-subpage page-title="$i18n{siteSettingsCategoryZoomLevels}"> | 263 <settings-subpage page-title="$i18n{siteSettingsCategoryZoomLevels}"> |
| 252 <zoom-levels></zoom-levels> | 264 <zoom-levels></zoom-levels> |
| 253 </settings-subpage> | 265 </settings-subpage> |
| 254 </template> | 266 </template> |
| 255 <template is="dom-if" route-path="/siteSettings/javascript" no-search> | 267 <template is="dom-if" route-path="/siteSettings/javascript" no-search> |
| 256 <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}"> | 268 <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}"> |
| 269 <button class="icon-help subpage-title-extra" | |
| 270 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 257 <site-settings-category | 271 <site-settings-category |
| 258 selected-site="{{selectedSite}}" | 272 selected-site="{{selectedSite}}" |
| 259 category="{{ContentSettingsTypes.JAVASCRIPT}}"> | 273 category="{{ContentSettingsTypes.JAVASCRIPT}}"> |
| 260 </site-settings-category> | 274 </site-settings-category> |
| 261 </settings-subpage> | 275 </settings-subpage> |
| 262 </template> | 276 </template> |
| 263 <template is="dom-if" route-path="/siteSettings/keygen" no-search> | 277 <template is="dom-if" route-path="/siteSettings/keygen" no-search> |
| 264 <settings-subpage page-title="$i18n{siteSettingsKeygen}"> | 278 <settings-subpage page-title="$i18n{siteSettingsKeygen}"> |
| 279 <button class="icon-help subpage-title-extra" | |
| 280 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 265 <site-settings-category | 281 <site-settings-category |
| 266 selected-site="{{selectedSite}}" | 282 selected-site="{{selectedSite}}" |
| 267 category="{{ContentSettingsTypes.KEYGEN}}"> | 283 category="{{ContentSettingsTypes.KEYGEN}}"> |
| 268 </site-settings-category> | 284 </site-settings-category> |
| 269 </settings-subpage> | 285 </settings-subpage> |
| 270 </template> | 286 </template> |
| 271 <template is="dom-if" route-path="/siteSettings/microphone" no-search> | 287 <template is="dom-if" route-path="/siteSettings/microphone" no-search> |
| 272 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}"> | 288 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}"> |
| 289 <button class="icon-help subpage-title-extra" | |
| 290 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 273 <site-settings-category | 291 <site-settings-category |
| 274 selected-site="{{selectedSite}}" | 292 selected-site="{{selectedSite}}" |
| 275 category="{{ContentSettingsTypes.MIC}}"> | 293 category="{{ContentSettingsTypes.MIC}}"> |
| 276 <media-picker type="mic" class="media-picker"></media-picker> | 294 <media-picker type="mic" class="media-picker"></media-picker> |
| 277 </site-settings-category> | 295 </site-settings-category> |
| 278 </settings-subpage> | 296 </settings-subpage> |
| 279 </template> | 297 </template> |
| 280 <template is="dom-if" route-path="/siteSettings/notifications" no-search> | 298 <template is="dom-if" route-path="/siteSettings/notifications" no-search> |
| 281 <settings-subpage page-title="$i18n{siteSettingsCategoryNotifications}"> | 299 <settings-subpage page-title="$i18n{siteSettingsCategoryNotifications}"> |
| 300 <button class="icon-help subpage-title-extra" | |
| 301 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 282 <site-settings-category | 302 <site-settings-category |
| 283 selected-site="{{selectedSite}}" | 303 selected-site="{{selectedSite}}" |
| 284 category="{{ContentSettingsTypes.NOTIFICATIONS}}"> | 304 category="{{ContentSettingsTypes.NOTIFICATIONS}}"> |
| 285 </site-settings-category> | 305 </site-settings-category> |
| 286 </settings-subpage> | 306 </settings-subpage> |
| 287 </template> | 307 </template> |
| 288 <template is="dom-if" route-path="/siteSettings/flash" no-search> | 308 <template is="dom-if" route-path="/siteSettings/flash" no-search> |
| 289 <settings-subpage page-title="$i18n{siteSettingsFlash}"> | 309 <settings-subpage page-title="$i18n{siteSettingsFlash}"> |
| 310 <button class="icon-help subpage-title-extra" | |
| 311 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 290 <site-settings-category | 312 <site-settings-category |
| 291 selected-site="{{selectedSite}}" | 313 selected-site="{{selectedSite}}" |
| 292 category="{{ContentSettingsTypes.PLUGINS}}"> | 314 category="{{ContentSettingsTypes.PLUGINS}}"> |
| 293 </site-settings-category> | 315 </site-settings-category> |
| 294 </settings-subpage> | 316 </settings-subpage> |
| 295 </template> | 317 </template> |
| 296 <template is="dom-if" route-path="/siteSettings/popups" no-search> | 318 <template is="dom-if" route-path="/siteSettings/popups" no-search> |
| 297 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}"> | 319 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}"> |
| 320 <button class="icon-help subpage-title-extra" | |
| 321 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 298 <site-settings-category | 322 <site-settings-category |
| 299 selected-site="{{selectedSite}}" | 323 selected-site="{{selectedSite}}" |
| 300 category="{{ContentSettingsTypes.POPUPS}}"> | 324 category="{{ContentSettingsTypes.POPUPS}}"> |
| 301 </site-settings-category> | 325 </site-settings-category> |
| 302 </settings-subpage> | 326 </settings-subpage> |
| 303 </template> | 327 </template> |
| 304 <template is="dom-if" route-path="/siteSettings/unsandboxedPlugins" | 328 <template is="dom-if" route-path="/siteSettings/unsandboxedPlugins" |
| 305 no-search> | 329 no-search> |
| 306 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}"> | 330 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}"> |
| 331 <button class="icon-help subpage-title-extra" | |
| 332 is="paper-icon-button-light" on-tap="onHelpTap_"></button> | |
| 307 <site-settings-category | 333 <site-settings-category |
| 308 selected-site="{{selectedSite}}" | 334 selected-site="{{selectedSite}}" |
| 309 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}"> | 335 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}"> |
| 310 </site-settings-category> | 336 </site-settings-category> |
| 311 </settings-subpage> | 337 </settings-subpage> |
| 312 </template> | 338 </template> |
| 313 <template is="dom-if" route-path="/siteSettings/usbDevices" no-search> | 339 <template is="dom-if" route-path="/siteSettings/usbDevices" no-search> |
| 314 <settings-subpage page-title="$i18n{siteSettingsUsbDevices}"> | 340 <settings-subpage page-title="$i18n{siteSettingsUsbDevices}"> |
| 315 <usb-devices></usb-devices> | 341 <usb-devices></usb-devices> |
| 316 </settings-subpage> | 342 </settings-subpage> |
| 317 </template> | 343 </template> |
| 318 <template is="dom-if" route-path="/siteSettings/siteDetails" no-search> | 344 <template is="dom-if" route-path="/siteSettings/siteDetails" no-search> |
| 319 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}"> | 345 <settings-subpage page-title="$i18n{siteSettingsSiteDetails}"> |
| 320 <site-details site="[[selectedSite]]"></site-details> | 346 <site-details site="[[selectedSite]]"></site-details> |
| 321 </settings-subpage> | 347 </settings-subpage> |
| 322 </template> | 348 </template> |
| 323 </settings-animated-pages> | 349 </settings-animated-pages> |
| 324 </template> | 350 </template> |
| 325 <script src="privacy_page.js"></script> | 351 <script src="privacy_page.js"></script> |
| 326 </dom-module> | 352 </dom-module> |
| OLD | NEW |