MD Settings: Update Protected Content for redesign

chrome/browser/resources/settings/privacy_page/privacy_page.html

Index: chrome/browser/resources/settings/privacy_page/privacy_page.html
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index 4bf462434a60e6f650baab76ea9c82b6e52718f2..c33cf3a09e9e15b0f43859d7983bee1661e67965 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -418,8 +418,19 @@
       </template>
       <template is="dom-if" route-path="/content/protectedContent" no-search>
         <settings-subpage page-title="$i18n{siteSettingsProtectedContent}">
+          <div class="settings-box first">
+            <!-- TODO(dschuyler): change i18n to i18nStr. -->
+            <settings-toggle-button class="start"
+                pref="{{prefs.webkit.webprefs.encrypted_media_enabled}}"
+                label="[[getStringTernary_(
+                    prefs.webkit.webprefs.encrypted_media_enabled.value,
+                    '$i18n{siteSettingsProtectedContentEnable}',
+                    '$i18n{siteSettingsBlocked}')]]">

[Dan Beam, 2017/02/10 17:23:53]

this will break on '

[tommycli, 2017/02/10 18:46:31]

+dschuyler

Indeed this does break on '. I thought we escaped that, but we only escape
double-quotes. Does it seem worth it to additionally escape this in
i18n_source_stream? If not, we probably need to abandon all usages of this
pattern in Settings. (There are many in site_settings_page.)

[dschuyler, 2017/02/10 19:07:58]

A CL to fix it is here: https://codereview.chromium.org/2681623002/
And a doc discussing it further is here:
https://docs.google.com/document/d/1qWU0tJfLbmE0clsCdLUy7etk3Of8hUb8qG87tYKM6...

[tommycli, 2017/02/10 19:17:00]

Hey thanks, that explains things.

In PS4, I've converted the code to use JavaScript i18n as stevenjb recommended
earlier. This should allow us to get unblocked and fix the protected content. We
can convert back to the ternary expression later once i18nStr is landed.

+            </settings-toggle-button>
+          </div>
+<if expr="chromeos or is_win">
           <div class="settings-box first two-line">
-            $i18n{siteSettingsProtectedContentExplanation}
+            $i18n{siteSettingsProtectedContentIdentifiersExplanation}
           </div>
           <div class="settings-box first">
             <!-- TODO(dschuyler): change i18n to i18nStr. -->
@@ -427,14 +438,18 @@
                 pref="{{prefs.settings.privacy.drm_enabled}}"
                 label="[[getStringTernary_(
                     prefs.settings.privacy.drm_enabled.value,
-                    '$i18n{siteSettingsProtectedContentEnable}',
+                    '$i18n{siteSettingsProtectedContentEnableIdentifiers}',
                     '$i18n{siteSettingsBlocked}')]]">
             </settings-toggle-button>
           </div>
+</if>
 <if expr="chromeos">
-          <category-setting-exceptions
-              category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">
-          </category-setting-exceptions>
+          <template is="dom-if"
+              if="[[prefs.settings.privacy.drm_enabled.value]]">
+            <category-setting-exceptions
+                category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">
+            </category-setting-exceptions>
+          </template>
 </if>
         </settings-subpage>
       </template>