Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2446)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/settings/site_settings_page/site_settings_page.html

Issue 2659833002: [MD settings] Data driven content setting subtext (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/settings/site_settings/site_settings_behavior.js ('k') | chrome/browser/resources/settings/site_settings_page/site_settings_page.js » ('j') | chrome/browser/resources/settings/site_settings_page/site_settings_page.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/site_settings_page/site_settings_page.html
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
index cb801ce9b86ede7b01f4a8e97d5979ac00da53a3..6f630369a7d8a8210d5365a1579a92204e6ac5f8 100644
--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
@@ -27,7 +27,10 @@
<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
Dan Beam 2017/01/27 01:03:08 using $i18n{} inside of something that's parsed as
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>
@@ -37,7 +40,10 @@
<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>
@@ -48,7 +54,10 @@
<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>
@@ -58,7 +67,10 @@
<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>
@@ -69,7 +81,10 @@
<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>
@@ -80,7 +95,9 @@
<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>
@@ -90,7 +107,10 @@
<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>
@@ -100,7 +120,9 @@
<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>
@@ -110,7 +132,9 @@
<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>
@@ -121,7 +145,10 @@
<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>
@@ -132,7 +159,11 @@
<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>
@@ -143,7 +174,10 @@
<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>
@@ -154,7 +188,10 @@
<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>
« no previous file with comments | « chrome/browser/resources/settings/site_settings/site_settings_behavior.js ('k') | chrome/browser/resources/settings/site_settings_page/site_settings_page.js » ('j') | chrome/browser/resources/settings/site_settings_page/site_settings_page.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698