diff --git a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch index 1de6953a..a9633592 100644 --- a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch +++ b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch @@ -4,9 +4,9 @@ Subject: Show site settings for cookies, javascript and ads Avoid displaying info about intrusive ads --- - .../site_settings/SingleWebsiteSettings.java | 62 +++++++++---------- - .../browser_ui/site_settings/Website.java | 20 ++++++ - 2 files changed, 49 insertions(+), 33 deletions(-) + .../site_settings/SingleWebsiteSettings.java | 60 +++++++++---------- + .../browser_ui/site_settings/Website.java | 20 +++++++ + 2 files changed, 48 insertions(+), 32 deletions(-) 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 @@ -19,18 +19,15 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c // Website permissions (if adding new, see hasPermissionsPreferences and resetSite below) // All permissions from the permissions preference category must be listed here. private static final String[] PERMISSION_PREFERENCE_KEYS = { -@@ -349,8 +350,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -349,6 +350,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setUpSoundPreference(preference); } else if (i == ContentSettingException.Type.JAVASCRIPT) { setUpJavascriptPreference(preference); + } else if (i == ContentSettingException.Type.COOKIE) { + setUpCookiePreference(preference); } else { -- setUpListPreference(preference, mSite.getContentSettingPermission(i)); -+ setUpListPreference(preference, permission); + setUpListPreference(preference, mSite.getContentSettingPermission(i)); } - return; - } @@ -666,19 +669,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment }