| 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 "$i18n{siteSettingsAllowRecentlyClosedSitesRecommended}" | 249 "$i18n{siteSettingsAllowRecentlyClosedSitesRecommended}" |
| 250 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> | 250 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> |
| 251 </category-default-setting> | 251 </category-default-setting> |
| 252 <category-setting-exceptions | 252 <category-setting-exceptions |
| 253 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> | 253 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> |
| 254 </category-setting-exceptions> | 254 </category-setting-exceptions> |
| 255 </settings-subpage> | 255 </settings-subpage> |
| 256 </template> | 256 </template> |
| 257 <template is="dom-if" route-path="/content/camera" no-search> | 257 <template is="dom-if" route-path="/content/camera" no-search> |
| 258 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> | 258 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> |
| 259 <media-picker type="camera"></media-picker> | 259 <media-picker label="$i18n{siteSettingsCameraLabel}" type="camera"> |
| 260 </media-picker> |
| 260 <category-default-setting category="{{ContentSettingsTypes.CAMERA}}" | 261 <category-default-setting category="{{ContentSettingsTypes.CAMERA}}" |
| 261 toggle-off-label="$i18n{siteSettingsBlocked}" | 262 toggle-off-label="$i18n{siteSettingsBlocked}" |
| 262 toggle-on-label= | 263 toggle-on-label= |
| 263 "$i18n{siteSettingsAskBeforeAccessingRecommended}"> | 264 "$i18n{siteSettingsAskBeforeAccessingRecommended}"> |
| 264 </category-default-setting> | 265 </category-default-setting> |
| 265 <category-setting-exceptions | 266 <category-setting-exceptions |
| 266 category="{{ContentSettingsTypes.CAMERA}}" read-only-list> | 267 category="{{ContentSettingsTypes.CAMERA}}" read-only-list> |
| 267 </category-setting-exceptions> | 268 </category-setting-exceptions> |
| 268 </settings-subpage> | 269 </settings-subpage> |
| 269 </template> | 270 </template> |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 toggle-on-label="$i18n{siteSettingsAllowedRecommended}" | 336 toggle-on-label="$i18n{siteSettingsAllowedRecommended}" |
| 336 category="{{ContentSettingsTypes.JAVASCRIPT}}"> | 337 category="{{ContentSettingsTypes.JAVASCRIPT}}"> |
| 337 </category-default-setting> | 338 </category-default-setting> |
| 338 <category-setting-exceptions | 339 <category-setting-exceptions |
| 339 category="{{ContentSettingsTypes.JAVASCRIPT}}"> | 340 category="{{ContentSettingsTypes.JAVASCRIPT}}"> |
| 340 </category-setting-exceptions> | 341 </category-setting-exceptions> |
| 341 </settings-subpage> | 342 </settings-subpage> |
| 342 </template> | 343 </template> |
| 343 <template is="dom-if" route-path="/content/microphone" no-search> | 344 <template is="dom-if" route-path="/content/microphone" no-search> |
| 344 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}"> | 345 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}"> |
| 345 <media-picker type="mic"></media-picker> | 346 <media-picker label="$i18n{siteSettingsMicrophoneLabel}" type="mic"> |
| 347 </media-picker> |
| 346 <category-default-setting category="{{ContentSettingsTypes.MIC}}" | 348 <category-default-setting category="{{ContentSettingsTypes.MIC}}" |
| 347 toggle-off-label="$i18n{siteSettingsBlocked}" | 349 toggle-off-label="$i18n{siteSettingsBlocked}" |
| 348 toggle-on-label= | 350 toggle-on-label= |
| 349 "$i18n{siteSettingsAskBeforeAccessingRecommended}"> | 351 "$i18n{siteSettingsAskBeforeAccessingRecommended}"> |
| 350 </category-default-setting> | 352 </category-default-setting> |
| 351 <category-setting-exceptions | 353 <category-setting-exceptions |
| 352 category="{{ContentSettingsTypes.MIC}}" read-only-list> | 354 category="{{ContentSettingsTypes.MIC}}" read-only-list> |
| 353 </category-setting-exceptions> | 355 </category-setting-exceptions> |
| 354 </settings-subpage> | 356 </settings-subpage> |
| 355 </template> | 357 </template> |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> | 488 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> |
| 487 </category-setting-exceptions> | 489 </category-setting-exceptions> |
| 488 </template> | 490 </template> |
| 489 </if> | 491 </if> |
| 490 </settings-subpage> | 492 </settings-subpage> |
| 491 </template> | 493 </template> |
| 492 </settings-animated-pages> | 494 </settings-animated-pages> |
| 493 </template> | 495 </template> |
| 494 <script src="privacy_page.js"></script> | 496 <script src="privacy_page.js"></script> |
| 495 </dom-module> | 497 </dom-module> |
| OLD | NEW |