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/i18n_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 5 <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/iron-flex-layout/iron-f lex-layout-classes.html"> |
| 6 <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/neon-animation/neon-ani matable.html"> |
| 7 <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-button/paper-butt on.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 9 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html"> | 9 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html"> |
| 10 <link rel="import" href="../controls/settings_toggle_button.html"> | 10 <link rel="import" href="../controls/settings_toggle_button.html"> |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 416 <site-data-details-subpage page-title="{{pageTitle}}"> | 416 <site-data-details-subpage page-title="{{pageTitle}}"> |
| 417 </site-data-details-subpage> | 417 </site-data-details-subpage> |
| 418 </settings-subpage> | 418 </settings-subpage> |
| 419 </template> | 419 </template> |
| 420 <template is="dom-if" route-path="/content/protectedContent" no-search> | 420 <template is="dom-if" route-path="/content/protectedContent" no-search> |
| 421 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}"> | 421 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}"> |
| 422 <div class="settings-box first"> | 422 <div class="settings-box first"> |
| 423 <settings-toggle-button class="start" | 423 <settings-toggle-button class="start" |
| 424 pref="{{prefs.webkit.webprefs.encrypted_media_enabled}}" | 424 pref="{{prefs.webkit.webprefs.encrypted_media_enabled}}" |
| 425 label="[[getProtectedContentLabel_( | 425 label="[[getProtectedContentLabel_( |
| 426 prefs.webkit.webprefs.encrypted_media_enabled.value)]]"> | 426 prefs.webkit.webprefs.encrypted_media_enabled.value)]]" |
| 427 disabled$="[[isGuest_]]"> | |
|
tommycli
2017/02/14 00:28:39
The existing usages of isGuest_ in the code specif
stevenjb
2017/02/14 00:49:23
This is consistent with current Settings. I stuck
| |
| 427 </settings-toggle-button> | 428 </settings-toggle-button> |
| 428 </div> | 429 </div> |
| 429 <if expr="chromeos or is_win"> | 430 <if expr="chromeos or is_win"> |
| 430 <div class="settings-box first two-line"> | 431 <div class="settings-box first two-line"> |
| 431 $i18n{siteSettingsProtectedContentIdentifiersExplanation} | 432 $i18n{siteSettingsProtectedContentIdentifiersExplanation} |
| 432 </div> | 433 </div> |
| 433 <div class="settings-box first"> | 434 <div class="settings-box first"> |
| 434 <settings-toggle-button class="start" | 435 <settings-toggle-button class="start" |
| 435 pref="{{prefs.settings.privacy.drm_enabled}}" | 436 pref="{{prefs.settings.privacy.drm_enabled}}" |
| 436 label="[[getProtectedContentIdentifiersLabel_( | 437 label="[[getProtectedContentIdentifiersLabel_( |
| 437 prefs.settings.privacy.drm_enabled.value)]]"> | 438 prefs.settings.privacy.drm_enabled.value)]]" |
| 439 disabled$="[[isGuest_]]"> | |
| 438 </settings-toggle-button> | 440 </settings-toggle-button> |
| 439 </div> | 441 </div> |
| 440 </if> | 442 </if> |
| 441 <if expr="chromeos"> | 443 <if expr="chromeos"> |
| 442 <template is="dom-if" | 444 <template is="dom-if" |
| 443 if="[[prefs.settings.privacy.drm_enabled.value]]"> | 445 if="[[prefs.settings.privacy.drm_enabled.value]]"> |
| 444 <category-setting-exceptions | 446 <category-setting-exceptions |
| 445 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> | 447 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> |
| 446 </category-setting-exceptions> | 448 </category-setting-exceptions> |
| 447 </template> | 449 </template> |
| 448 </if> | 450 </if> |
| 449 </settings-subpage> | 451 </settings-subpage> |
| 450 </template> | 452 </template> |
| 451 </settings-animated-pages> | 453 </settings-animated-pages> |
| 452 </template> | 454 </template> |
| 453 <script src="privacy_page.js"></script> | 455 <script src="privacy_page.js"></script> |
| 454 </dom-module> | 456 </dom-module> |
| OLD | NEW |