Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java |
index 3322c8c3627afea85134b63632f371ed94f77c1a..f2480c39121b16ba931a9395ac9a1f1d93ac7543 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java |
@@ -62,6 +62,8 @@ public class WebsitePermissionsFetcher { |
// Popup exceptions are host-based patterns (unless we start |
// synchronizing popup exceptions with desktop Chrome). |
queue.add(new PopupExceptionInfoFetcher()); |
+ // Subresource filter exceptions are host-based. |
+ queue.add(new SubresourceFilterExceptionInfoFetcher()); |
// JavaScript exceptions are host-based patterns. |
queue.add(new JavaScriptExceptionInfoFetcher()); |
// Protected media identifier permission is per-origin and per-embedder. |
@@ -118,6 +120,9 @@ public class WebsitePermissionsFetcher { |
// Popup exceptions are host-based patterns (unless we start |
// synchronizing popup exceptions with desktop Chrome.) |
queue.add(new PopupExceptionInfoFetcher()); |
+ } else if (category.showSubresourceFilterSites()) { |
+ // Subresource filter exceptions are host-based. |
+ queue.add(new SubresourceFilterExceptionInfoFetcher()); |
} else if (category.showJavaScriptSites()) { |
// JavaScript exceptions are host-based patterns. |
queue.add(new JavaScriptExceptionInfoFetcher()); |
@@ -179,6 +184,9 @@ public class WebsitePermissionsFetcher { |
case ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS: |
site.setPopupException(exception); |
break; |
+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER: |
+ site.setSubresourceFilterException(exception); |
+ break; |
default: |
assert false : "Unexpected content setting type received: " |
+ contentSettingsType; |
@@ -253,6 +261,13 @@ public class WebsitePermissionsFetcher { |
} |
} |
+ private class SubresourceFilterExceptionInfoFetcher extends Task { |
+ @Override |
+ public void run() { |
+ setException(ContentSettingsType.CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER); |
+ } |
+ } |
+ |
private class JavaScriptExceptionInfoFetcher extends Task { |
@Override |
public void run() { |