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/cr_elements/policy/cr_policy_vars_cs s.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.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-button/paper-butt on.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 8 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html"> | 8 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html"> |
| 9 <link rel="import" href="../controls/settings_toggle_button.html"> | 9 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 10 <link rel="import" href="../lifetime_browser_proxy.html"> | 10 <link rel="import" href="../lifetime_browser_proxy.html"> |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 411 <paper-button class="subpage-title-extra" | 411 <paper-button class="subpage-title-extra" |
| 412 on-tap="onRemoveAllCookiesFromSite_"> | 412 on-tap="onRemoveAllCookiesFromSite_"> |
| 413 $i18n{siteSettingsCookieRemoveAll} | 413 $i18n{siteSettingsCookieRemoveAll} |
| 414 </paper-button> | 414 </paper-button> |
| 415 <site-data-details-subpage page-title="{{pageTitle}}"> | 415 <site-data-details-subpage page-title="{{pageTitle}}"> |
| 416 </site-data-details-subpage> | 416 </site-data-details-subpage> |
| 417 </settings-subpage> | 417 </settings-subpage> |
| 418 </template> | 418 </template> |
| 419 <template is="dom-if" route-path="/content/protectedContent" no-search> | 419 <template is="dom-if" route-path="/content/protectedContent" no-search> |
| 420 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}"> | 420 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}"> |
| 421 <div class="settings-box first"> | |
| 422 <!-- TODO(dschuyler): change i18n to i18nStr. --> | |
| 423 <settings-toggle-button class="start" | |
| 424 pref="{{prefs.webkit.webprefs.encrypted_media_enabled}}" | |
| 425 label="[[getStringTernary_( | |
| 426 prefs.webkit.webprefs.encrypted_media_enabled.value, | |
| 427 '$i18n{siteSettingsProtectedContentEnable}', | |
| 428 '$i18n{siteSettingsBlocked}')]]"> | |
|
stevenjb
2017/02/10 00:32:31
Just FMI, any particular reason to do this in the
tommycli
2017/02/10 00:51:37
Ask dschuyler for details, but the plan is to even
stevenjb
2017/02/10 01:12:47
Hmm, I am unconvinced that is achievable, but if i
tommycli
2017/02/10 16:58:42
Hey - I should be more specific... if we can remov
stevenjb
2017/02/10 17:21:07
OK, that makes sense. I was actually suggesting:
| |
| 429 </settings-toggle-button> | |
| 430 </div> | |
| 431 <if expr="chromeos or is_win"> | |
| 421 <div class="settings-box first two-line"> | 432 <div class="settings-box first two-line"> |
| 422 $i18n{siteSettingsProtectedContentExplanation} | 433 $i18n{siteSettingsProtectedContentIdentifiersExplanation} |
| 423 </div> | 434 </div> |
| 424 <div class="settings-box first"> | 435 <div class="settings-box first"> |
| 425 <!-- TODO(dschuyler): change i18n to i18nStr. --> | 436 <!-- TODO(dschuyler): change i18n to i18nStr. --> |
| 426 <settings-toggle-button class="start" | 437 <settings-toggle-button class="start" |
| 427 pref="{{prefs.settings.privacy.drm_enabled}}" | 438 pref="{{prefs.settings.privacy.drm_enabled}}" |
| 428 label="[[getStringTernary_( | 439 label="[[getStringTernary_( |
| 429 prefs.settings.privacy.drm_enabled.value, | 440 prefs.settings.privacy.drm_enabled.value, |
| 430 '$i18n{siteSettingsProtectedContentEnable}', | 441 '$i18n{siteSettingsProtectedContentEnableIdentifiers}', |
| 431 '$i18n{siteSettingsBlocked}')]]"> | 442 '$i18n{siteSettingsBlocked}')]]"> |
| 432 </settings-toggle-button> | 443 </settings-toggle-button> |
| 433 </div> | 444 </div> |
| 445 </if> | |
| 434 <if expr="chromeos"> | 446 <if expr="chromeos"> |
| 435 <category-setting-exceptions | 447 <template is="dom-if" |
| 436 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> | 448 if="[[prefs.settings.privacy.drm_enabled.value]]"> |
| 437 </category-setting-exceptions> | 449 <category-setting-exceptions |
| 450 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> | |
| 451 </category-setting-exceptions> | |
| 452 </template> | |
| 438 </if> | 453 </if> |
| 439 </settings-subpage> | 454 </settings-subpage> |
| 440 </template> | 455 </template> |
| 441 </settings-animated-pages> | 456 </settings-animated-pages> |
| 442 </template> | 457 </template> |
| 443 <script src="privacy_page.js"></script> | 458 <script src="privacy_page.js"></script> |
| 444 </dom-module> | 459 </dom-module> |
| OLD | NEW |