Commit 6b4f9da3 authored by Balazs Engedy's avatar Balazs Engedy Committed by Commit Bot

Add "Ignored" tag on unsupported Flash per-site settings.

As per request from A11Y, instead of just displaying unsupported site
settings with strike-through, add a label spelling "Ignored" next to it.

Bug: 1116608
Change-Id: Ie47a5e7bf3dd8a4cf12ccc0e9f75b3d48fe8d62d
TBR: khorimoto@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2358109Reviewed-by: default avatarBalazs Engedy <engedy@chromium.org>
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Auto-Submit: Balazs Engedy <engedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798441}
parent 071f92ee
...@@ -7,10 +7,14 @@ ...@@ -7,10 +7,14 @@
flex: 1 flex: 1
} }
.settings-row.discarded { .settings-row.discarded .display-name {
text-decoration: line-through; text-decoration: line-through;
} }
.settings-row.discarded .discarded-label {
margin-inline-start: 8px;
}
/* Tooltip is hidden since site-list will display a common tooltip. */ /* Tooltip is hidden since site-list will display a common tooltip. */
cr-policy-pref-indicator::part(tooltip) { cr-policy-pref-indicator::part(tooltip) {
display: none; display: none;
...@@ -22,7 +26,10 @@ ...@@ -22,7 +26,10 @@
<site-favicon url="[[model.origin]]"></site-favicon> <site-favicon url="[[model.origin]]"></site-favicon>
<div class="middle no-min-width"> <div class="middle no-min-width">
<div class="text-elide"> <div class="text-elide">
<span class="url-directionality">[[computeDisplayName_(model)]] <span class="display-name url-directionality">
[[computeDisplayName_(model)]]</span>
<span class="discarded-label"
hidden="[[!model.isDiscarded]]">$i18n{discardedPerSiteSetting}
</span> </span>
</div> </div>
......
...@@ -1231,6 +1231,10 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, ...@@ -1231,6 +1231,10 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
static constexpr webui::LocalizedString kLocalizedStrings[] = { static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"privacyPageTitle", IDS_SETTINGS_PRIVACY}, {"privacyPageTitle", IDS_SETTINGS_PRIVACY},
{"privacyPageMore", IDS_SETTINGS_PRIVACY_MORE}, {"privacyPageMore", IDS_SETTINGS_PRIVACY_MORE},
// TODO(crbug.com/1116608): This seemingly unrelated string resource is
// used because it already has a localized version available in M85, so
// we can ship this label in M85 on short notice.
{"discardedPerSiteSetting", IDS_POLICY_LABEL_IGNORED},
{"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK}, {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK},
{"doNotTrackDialogTitle", IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TITLE}, {"doNotTrackDialogTitle", IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TITLE},
// TODO(crbug.com/1062607): This string is no longer used. Remove. // TODO(crbug.com/1062607): This string is no longer used. Remove.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment