Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java |
index bb4c392fee554eb9091116e2e35261dcb8b149fd..8198195881a3a9c548adf7cd4188312ddbd0fe7e 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java |
@@ -228,6 +228,8 @@ public class SingleCategoryPreferences extends PreferenceFragment |
return website.site().getPopupPermission() == ContentSetting.BLOCK; |
} else if (mCategory.showProtectedMediaSites()) { |
return website.site().getProtectedMediaIdentifierPermission() == ContentSetting.BLOCK; |
+ } else if (mCategory.showSubresourceFilterSites()) { |
+ return website.site().getSubresourceFilterPermission() == ContentSetting.BLOCK; |
} |
return false; |
@@ -490,6 +492,9 @@ public class SingleCategoryPreferences extends PreferenceFragment |
} else if (mCategory.showProtectedMediaSites()) { |
PrefServiceBridge.getInstance().setProtectedMediaIdentifierEnabled( |
(boolean) newValue); |
+ } else if (mCategory.showSubresourceFilterSites()) { |
+ PrefServiceBridge.getInstance().setAllowSubresourceFilterEnabled( |
+ (boolean) newValue); |
} |
// Categories that support adding exceptions also manage the 'Add site' preference. |
@@ -717,6 +722,9 @@ public class SingleCategoryPreferences extends PreferenceFragment |
} else if (mCategory.showProtectedMediaSites()) { |
globalToggle.setChecked( |
PrefServiceBridge.getInstance().isProtectedMediaIdentifierEnabled()); |
+ } else if (mCategory.showSubresourceFilterSites()) { |
+ globalToggle.setChecked( |
+ PrefServiceBridge.getInstance().subresourceFilterEnabled()); |
} |
} |
} |