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 5764a02ae897e915a1e8c226adf673a31f1441b5..654b17055659ebac7c4692542445ac80b00a957c 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 |
@@ -63,8 +63,6 @@ public class WebsitePermissionsFetcher { |
queue.add(new CookieInfoFetcher()); |
// Fullscreen are stored per-origin. |
queue.add(new FullscreenInfoFetcher()); |
- // Images exceptions are host-based patterns. |
- queue.add(new ImagesExceptionInfoFetcher()); |
// Local storage info is per-origin. |
queue.add(new LocalStorageInfoFetcher()); |
// Website storage is per-host. |
@@ -133,9 +131,6 @@ public class WebsitePermissionsFetcher { |
} else if (filterHelper.showProtectedMediaSites(filter)) { |
// Protected media identifier permission is per-origin and per-embedder. |
queue.add(new ProtectedMediaIdentifierInfoFetcher()); |
- } else if (filterHelper.showImagesSites(filter)) { |
- // Images exceptions are host-based patterns. |
- queue.add(new ImagesExceptionInfoFetcher()); |
} |
queue.add(new PermissionsAvailableCallbackRunner()); |
queue.next(); |
@@ -278,28 +273,6 @@ public class WebsitePermissionsFetcher { |
} |
} |
- /** |
- * Class for fetching the images information. |
- */ |
- private class ImagesExceptionInfoFetcher implements Task { |
- @Override |
- public void run(TaskQueue queue) { |
- for (ContentSettingException exception |
- : WebsitePreferenceBridge.getContentSettingsExceptions( |
- ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES)) { |
- // The pattern "*" represents the default setting, not a specific website. |
- if (exception.getPattern().equals("*")) continue; |
- WebsiteAddress address = WebsiteAddress.create(exception.getPattern()); |
- if (address == null) continue; |
- Set<Website> sites = findOrCreateSitesByHost(address); |
- for (Website site : sites) { |
- site.setImagesException(exception); |
- } |
- } |
- queue.next(); |
- } |
- } |
- |
private class LocalStorageInfoFetcher implements Task { |
@Override |
public void run(final TaskQueue queue) { |