Skip to content

Commit

Permalink
Show javascript site setting in page info also in desktop
Browse files Browse the repository at this point in the history
  • Loading branch information
uazo committed Feb 4, 2024
1 parent c39e3f2 commit 151a547
Showing 1 changed file with 15 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../site_settings/SingleWebsiteSettings.java | 56 +++++++++----------
.../browser_ui/site_settings/Website.java | 14 ++++-
2 files changed, 40 insertions(+), 30 deletions(-)
.../bromite_content_settings/javascript.inc | 3 +
3 files changed, 43 insertions(+), 30 deletions(-)
create mode 100644 components/content_settings/core/browser/bromite_content_settings/javascript.inc

diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
@@ -556,6 +556,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@@ -568,6 +568,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
setUpSoundPreference(preference);
} else if (type == ContentSettingsType.JAVASCRIPT) {
setUpJavascriptPreference(preference);
Expand All @@ -22,7 +24,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
} else if (type == ContentSettingsType.GEOLOCATION) {
setUpLocationPreference(preference);
} else if (type == ContentSettingsType.NOTIFICATIONS) {
@@ -1005,17 +1007,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@@ -1017,17 +1019,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
private void setUpAdsInformationalBanner() {
// Add the informational banner which shows at the top of the UI if ad blocking is
// activated on this site.
Expand All @@ -40,7 +42,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
}

private SiteSettingsCategory getWarningCategory() {
@@ -1201,17 +1194,35 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@@ -1217,17 +1210,35 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@Nullable
Integer currentValue =
mSite.getContentSetting(browserContextHandle, ContentSettingsType.JAVASCRIPT);
Expand Down Expand Up @@ -83,7 +85,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
/**
* Updates the ads list preference based on whether the site is a candidate for blocking. This
* has some custom behavior.
@@ -1227,23 +1238,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
@@ -1243,23 +1254,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
setupContentSettingsPreference(preference, null, false);
return;
}
Expand Down Expand Up @@ -131,4 +133,12 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
"",
/* isEmbargoed= */ false);
setContentSettingException(type, exception);
diff --git a/components/content_settings/core/browser/bromite_content_settings/javascript.inc b/components/content_settings/core/browser/bromite_content_settings/javascript.inc
new file mode 100644
--- /dev/null
+++ b/components/content_settings/core/browser/bromite_content_settings/javascript.inc
@@ -0,0 +1,3 @@
+ content_settings::WebsiteSettingsRegistry::GetInstance()
+ ->GetMutable(ContentSettingsType::JAVASCRIPT)
+ ->set_show_into_info_page();
--

0 comments on commit 151a547

Please sign in to comment.