[MD settings] Data driven content setting subtext

chrome/browser/resources/settings/site_settings_page/site_settings_page.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
 <link rel="import" href="/icons.html">
 <link rel="import" href="/route.html">
 <link rel="import" href="/settings_shared_css.html">
 <link rel="import" href="/site_settings/constants.html">
 <link rel="import" href="/site_settings/site_settings_behavior.html">
 <link rel="import" href="/site_settings/site_settings_prefs_browser_proxy.html">
 
 <dom-module id="settings-site-settings-page">
   <template>
     <style include="settings-shared"></style>
     <template is="dom-if" if="[[enableSiteSettings_]]">
       <div class="settings-box first" category$="[[ALL_SITES]]"
           data-route="SITE_SETTINGS_ALL" on-tap="onTapNavigate_" actionable>
         <iron-icon icon="settings:list"></iron-icon>
         <div class="middle">$i18n{siteSettingsCategoryAllSites}</div>
         <button class="subpage-arrow" is="paper-icon-button-light"></button>
       </div>
       <div class="settings-box line-only">
       </div>
     </template>
     <div class="settings-box two-line first"
         category$="[[ContentSettingsTypes.COOKIES]]"
         data-route="SITE_SETTINGS_COOKIES" on-tap="onTapNavigate_" actionable>
       <iron-icon icon="settings:cookie"></iron-icon>
       <div class="middle">
         <div>$i18n{siteSettingsCookies}</div>
-        <div class="secondary">[[default_.cookies]]</div>
+        <div class="secondary">[[defaultSettingLabel_(default_.cookies,
+            '$i18n{siteSettingsCookiesAllowed}', '$i18n{siteSettingsBlocked}',
+             '$i18n{deleteDataPostSession}')]]

[Dan Beam, 2017/01/27 01:55:33]

indent off

[dschuyler, 2017/01/27 22:29:17]

Done.

+        </div>

[tommycli, 2017/01/27 00:36:52]

Okay now seeing the variety of formattings, maybe I'd suggest they just all do:

<div class="secondary">
  [[defaultSettingLabel_(
      default_.cookies,
      '$i18n{siteSettingsCookiesAllowed}',
      '$i18n{siteSettingsBlocked}',
      '$i18n{deleteDataPostSession}')]]
</div>

Takes up many lines but all the same.

[Dan Beam, 2017/01/27 01:03:08]

using $i18n{} inside of something that's parsed as a string literal may not be
safe

[dschuyler, 2017/01/27 22:29:17]

Done.

[dschuyler, 2017/01/27 22:29:17]

Responded above.

       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box two-line"
         category$="[[ContentSettingsTypes.GEOLOCATION]]"
         data-route="SITE_SETTINGS_LOCATION" on-tap="onTapNavigate_" actionable>
       <iron-icon icon="settings:location-on"></iron-icon>
       <div class="middle">
         <div>$i18n{siteSettingsLocation}</div>
-        <div class="secondary">[[default_.location]]</div>
+        <div class="secondary">[[defaultSettingLabel_(default_.location,
+            '$i18n{siteSettingsAskBeforeAccessing}',
+            '$i18n{siteSettingsBlocked}')]]
+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box two-line"
         category$="[[ContentSettingsTypes.CAMERA]]"
         data-route="SITE_SETTINGS_CAMERA"
         on-tap="onTapNavigate_" actionable>
       <iron-icon icon="settings:videocam"></iron-icon>
       <div class="middle">
         <div>$i18n{siteSettingsCamera}</div>
-        <div class="secondary">[[default_.mediaStreamCamera]]</div>
+        <div class="secondary">[[defaultSettingLabel_(
+            default_.mediaStreamCamera, '$i18n{siteSettingsAskBeforeAccessing}',
+            '$i18n{siteSettingsBlocked}')]]
+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box two-line" category$="[[ContentSettingsTypes.MIC]]"
         data-route="SITE_SETTINGS_MICROPHONE" on-tap="onTapNavigate_"
         actionable>
       <iron-icon icon="settings:mic"></iron-icon>
       <div class="middle">
         $i18n{siteSettingsMic}
-        <div class="secondary">[[default_.mediaStreamMic]]</div>
+        <div class="secondary">[[defaultSettingLabel_(default_.mediaStreamMic,
+            '$i18n{siteSettingsAskBeforeAccessing}',
+            '$i18n{siteSettingsBlocked}')]]
+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box two-line"
         category$="[[ContentSettingsTypes.NOTIFICATIONS]]"
         data-route="SITE_SETTINGS_NOTIFICATIONS" on-tap="onTapNavigate_"
         actionable>
       <iron-icon icon="settings:notifications"></iron-icon>
       <div class="middle">
         $i18n{siteSettingsNotifications}
-        <div class="secondary">[[default_.notifications]]</div>
+        <div class="secondary">[[defaultSettingLabel_(default_.notifications,
+              '$i18n{siteSettingsAskBeforeSending}',
+              '$i18n{siteSettingsBlocked}')]]

[Dan Beam, 2017/01/27 01:55:33]

indent off

[dschuyler, 2017/01/27 22:29:17]

Done.

+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box two-line"
         category$="[[ContentSettingsTypes.JAVASCRIPT]]"
         data-route="SITE_SETTINGS_JAVASCRIPT" on-tap="onTapNavigate_"
         actionable>
       <iron-icon icon="settings:input"></iron-icon>
       <div class="middle">
         $i18n{siteSettingsJavascript}
-        <div class="secondary">[[default_.javascript]]</div>
+        <div class="secondary">[[defaultSettingLabel_(default_.javascript,
+            '$i18n{siteSettingsAllowed}', '$i18n{siteSettingsBlocked}')]]
+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box two-line"
         category$="[[ContentSettingsTypes.PLUGINS]]"
         data-route="SITE_SETTINGS_FLASH" on-tap="onTapNavigate_" actionable>
       <iron-icon icon="cr:extension"></iron-icon>
       <div class="middle">
         $i18n{siteSettingsFlash}
-        <div class="secondary">[[default_.plugins]]</div>
+        <div class="secondary">[[defaultSettingLabel_(default_.plugins,
+            '$i18n{siteSettingsFlashAllow}', '$i18n{siteSettingsFlashBlock}',
+            '$i18n{siteSettingsFlashAskBefore}')]]
+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box two-line"
         category$="[[ContentSettingsTypes.IMAGES]]"
         data-route="SITE_SETTINGS_IMAGES" on-tap="onTapNavigate_" actionable>
       <iron-icon icon="settings:photo"></iron-icon>
       <div class="middle">
         $i18n{siteSettingsImages}
-        <div class="secondary">[[default_.images]]</div>
+        <div class="secondary">[[defaultSettingLabel_(default_.images,
+            '$i18n{siteSettingsShowAll}', '$i18n{siteSettingsDontShowImages}')]]
+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div category$="[[ContentSettingsTypes.POPUPS]]"
         class="settings-box two-line" data-route="SITE_SETTINGS_POPUPS"
         on-tap="onTapNavigate_" actionable>
       <iron-icon icon="cr:open-in-new"></iron-icon>
       <div class="middle">
         $i18n{siteSettingsPopups}
-        <div class="secondary">[[default_.popups]]</div>
+        <div class="secondary">[[defaultSettingLabel_(default_.popups,
+            '$i18n{siteSettingsAllowed}', '$i18n{siteSettingsBlocked}')]]
+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box two-line"
         category$="[[ContentSettingsTypes.BACKGROUND_SYNC]]"
         data-route="SITE_SETTINGS_BACKGROUND_SYNC" on-tap="onTapNavigate_"
         actionable>
       <iron-icon icon="settings:sync"></iron-icon>
       <div class="middle">
         $i18n{siteSettingsBackgroundSync}
-        <div class="secondary">[[default_.backgroundSync]]</div>
+        <div class="secondary">[[defaultSettingLabel_(default_.backgroundSync,
+            '$i18n{siteSettingsAllowRecentlyClosedSites}',
+            '$i18n{siteSettingsBackgroundSyncBlocked}')]]
+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box two-line"
         category$="[[ContentSettingsTypes.AUTOMATIC_DOWNLOADS]]"
         data-route="SITE_SETTINGS_AUTOMATIC_DOWNLOADS"
         on-tap="onTapNavigate_" actionable>
       <iron-icon icon="cr:file-download"></iron-icon>
       <div class="middle">
         $i18n{siteSettingsAutomaticDownloads}
-        <div class="secondary">[[default_.multipleAutomaticDownloads]]</div>
+        <div class="secondary">[[defaultSettingLabel_(
+            default_.multipleAutomaticDownloads,
+            '$i18n{siteSettingsAutoDownloadAsk}',
+            '$i18n{siteSettingsAutoDownloadBlock}')]]
+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box two-line"
         category$="[[ContentSettingsTypes.UNSANDBOXED_PLUGINS]]"
         data-route="SITE_SETTINGS_UNSANDBOXED_PLUGINS"
         on-tap="onTapNavigate_" actionable>
       <iron-icon icon="cr:extension"></iron-icon>
       <div class="middle">
         $i18n{siteSettingsUnsandboxedPlugins}
-        <div class="secondary">[[default_.ppapiBroker]]</div>
+        <div class="secondary">[[defaultSettingLabel_(default_.ppapiBroker,
+            '$i18n{siteSettingsUnsandboxedPluginsAsk}',
+            '$i18n{siteSettingsUnsandboxedPluginsBlock}')]]
+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box two-line"
         category$="[[ContentSettingsTypes.PROTOCOL_HANDLERS]]"
         data-route="SITE_SETTINGS_HANDLERS"
         on-tap="onTapNavigate_" actionable>
       <iron-icon icon="settings:protocol-handler"></iron-icon>
       <div class="middle">
         $i18n{siteSettingsHandlers}
-        <div class="secondary">[[default_.registerProtocolHandler]]</div>
+        <div class="secondary">[[defaultSettingLabel_(
+            default_.registerProtocolHandler, '$i18n{siteSettingsHandlersAsk}',
+            '$i18n{siteSettingsHandlersBlocked}')]]
+        </div>
       </div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box" category$="[[ContentSettingsTypes.ZOOM_LEVELS]]"
         data-route="SITE_SETTINGS_ZOOM_LEVELS"
         on-tap="onTapNavigate_" actionable>
       <iron-icon icon="settings:zoom-in"></iron-icon>
       <div class="middle">$i18n{siteSettingsZoomLevels}</div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box" category$="[[ContentSettingsTypes.USB_DEVICES]]"
         data-route="SITE_SETTINGS_USB_DEVICES"
         on-tap="onTapNavigate_" actionable>
       <iron-icon icon="settings:usb"></iron-icon>
       <div class="middle">$i18n{siteSettingsUsbDevices}</div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
     <div class="settings-box" data-route="SITE_SETTINGS_PDF_DOCUMENTS"
         on-tap="onTapNavigate_" actionable>
       <iron-icon icon="settings:pdf"></iron-icon>
       <div class="middle">$i18n{siteSettingsPdfDocuments}</div>
       <button class="subpage-arrow" is="paper-icon-button-light"></button>
     </div>
   </template>
   <script src="site_settings_page.js"></script>
 </dom-module>