Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4362)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java

Issue 2785913002: [subresource_filter] Add the Content Settings UI for Android (Closed)
Patch Set: nits (trybots prev) Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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());
}
}
}

Powered by Google App Engine
This is Rietveld 408576698