Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes site settings JS page (1.19.x). #7582

Merged
merged 1 commit into from
Jan 13, 2021
Merged

Fixes site settings JS page (1.19.x). #7582

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index 5db3d9b229ccf62f754c3671ab7eeabcfe7eede4..cc5d2ab84daf4f376753ae22ecbc2773909a1f30 100644
index 5db3d9b229ccf62f754c3671ab7eeabcfe7eede4..90a6e6b391d71d4bca771eaf7b649bdeaae82623 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -29,6 +29,7 @@
Expand All @@ -26,22 +26,20 @@ index 5db3d9b229ccf62f754c3671ab7eeabcfe7eede4..cc5d2ab84daf4f376753ae22ecbc2773
<template is="dom-if" route-path="/content/camera" no-search>
<settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"
search-label="$i18n{siteSettingsAllSitesSearch}"
@@ -402,6 +405,7 @@
@@ -402,11 +405,13 @@
</category-setting-exceptions>
</template>
<template is="dom-if" if="[[!enableContentSettingsRedesign_]]">
+<if expr="_google_chrome">
<category-default-setting
toggle-off-label="$i18n{siteSettingsBlocked}"
toggle-on-label="$i18n{siteSettingsAllowedRecommended}"
@@ -413,6 +417,7 @@
allow-header="$i18n{siteSettingsAllow}"
search-filter="[[searchFilter_]]">
</category-setting-exceptions>
category="[[ContentSettingsTypes.JAVASCRIPT]]">
</category-default-setting>
+</if>
</template>
</settings-subpage>
</template>
<category-setting-exceptions
category="[[ContentSettingsTypes.JAVASCRIPT]]"
block-header="$i18n{siteSettingsBlock}"
@@ -706,6 +711,19 @@
</settings-subpage>
</template>
Expand Down