| 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/cr_elements/cr_dialog/cr_dialog.html
"> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs
s.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs
s.html"> |
| 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 10 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo
g.html"> | 10 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo
g.html"> |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 "$i18n{siteSettingsAllowRecentlyClosedSitesRecommended}" | 251 "$i18n{siteSettingsAllowRecentlyClosedSitesRecommended}" |
| 252 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> | 252 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> |
| 253 </category-default-setting> | 253 </category-default-setting> |
| 254 <category-setting-exceptions | 254 <category-setting-exceptions |
| 255 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> | 255 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> |
| 256 </category-setting-exceptions> | 256 </category-setting-exceptions> |
| 257 </settings-subpage> | 257 </settings-subpage> |
| 258 </template> | 258 </template> |
| 259 <template is="dom-if" route-path="/content/camera" no-search> | 259 <template is="dom-if" route-path="/content/camera" no-search> |
| 260 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> | 260 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> |
| 261 <media-picker type="camera"></media-picker> | 261 <media-picker label="$i18n{siteSettingsCameraLabel}" type="camera"> |
| 262 </media-picker> |
| 262 <category-default-setting category="{{ContentSettingsTypes.CAMERA}}" | 263 <category-default-setting category="{{ContentSettingsTypes.CAMERA}}" |
| 263 toggle-off-label="$i18n{siteSettingsBlocked}" | 264 toggle-off-label="$i18n{siteSettingsBlocked}" |
| 264 toggle-on-label= | 265 toggle-on-label= |
| 265 "$i18n{siteSettingsAskBeforeAccessingRecommended}"> | 266 "$i18n{siteSettingsAskBeforeAccessingRecommended}"> |
| 266 </category-default-setting> | 267 </category-default-setting> |
| 267 <category-setting-exceptions | 268 <category-setting-exceptions |
| 268 category="{{ContentSettingsTypes.CAMERA}}" read-only-list> | 269 category="{{ContentSettingsTypes.CAMERA}}" read-only-list> |
| 269 </category-setting-exceptions> | 270 </category-setting-exceptions> |
| 270 </settings-subpage> | 271 </settings-subpage> |
| 271 </template> | 272 </template> |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 toggle-on-label="$i18n{siteSettingsAllowedRecommended}" | 338 toggle-on-label="$i18n{siteSettingsAllowedRecommended}" |
| 338 category="{{ContentSettingsTypes.JAVASCRIPT}}"> | 339 category="{{ContentSettingsTypes.JAVASCRIPT}}"> |
| 339 </category-default-setting> | 340 </category-default-setting> |
| 340 <category-setting-exceptions | 341 <category-setting-exceptions |
| 341 category="{{ContentSettingsTypes.JAVASCRIPT}}"> | 342 category="{{ContentSettingsTypes.JAVASCRIPT}}"> |
| 342 </category-setting-exceptions> | 343 </category-setting-exceptions> |
| 343 </settings-subpage> | 344 </settings-subpage> |
| 344 </template> | 345 </template> |
| 345 <template is="dom-if" route-path="/content/microphone" no-search> | 346 <template is="dom-if" route-path="/content/microphone" no-search> |
| 346 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}"> | 347 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}"> |
| 347 <media-picker type="mic"></media-picker> | 348 <media-picker label="$i18n{siteSettingsMicrophoneLabel}" type="mic"> |
| 349 </media-picker> |
| 348 <category-default-setting category="{{ContentSettingsTypes.MIC}}" | 350 <category-default-setting category="{{ContentSettingsTypes.MIC}}" |
| 349 toggle-off-label="$i18n{siteSettingsBlocked}" | 351 toggle-off-label="$i18n{siteSettingsBlocked}" |
| 350 toggle-on-label= | 352 toggle-on-label= |
| 351 "$i18n{siteSettingsAskBeforeAccessingRecommended}"> | 353 "$i18n{siteSettingsAskBeforeAccessingRecommended}"> |
| 352 </category-default-setting> | 354 </category-default-setting> |
| 353 <category-setting-exceptions | 355 <category-setting-exceptions |
| 354 category="{{ContentSettingsTypes.MIC}}" read-only-list> | 356 category="{{ContentSettingsTypes.MIC}}" read-only-list> |
| 355 </category-setting-exceptions> | 357 </category-setting-exceptions> |
| 356 </settings-subpage> | 358 </settings-subpage> |
| 357 </template> | 359 </template> |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 488 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> | 490 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> |
| 489 </category-setting-exceptions> | 491 </category-setting-exceptions> |
| 490 </template> | 492 </template> |
| 491 </if> | 493 </if> |
| 492 </settings-subpage> | 494 </settings-subpage> |
| 493 </template> | 495 </template> |
| 494 </settings-animated-pages> | 496 </settings-animated-pages> |
| 495 </template> | 497 </template> |
| 496 <script src="privacy_page.js"></script> | 498 <script src="privacy_page.js"></script> |
| 497 </dom-module> | 499 </dom-module> |
| OLD | NEW |