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

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

Issue 1068223002: Implement Site Settings \ Images category. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and fix merge conflict Created 5 years, 8 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/WebsitePreferenceBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java
index ab6d50f8b8e61e7613a741ca0129c4cb4081d2be..3baa5e10a5d06e06f52fb8abaf3657721d7b32b5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java
@@ -163,31 +163,18 @@ public abstract class WebsitePreferenceBridge {
list.add(new VoiceAndVideoCaptureInfo(origin, embedder));
}
- public static List<JavaScriptExceptionInfo> getJavaScriptExceptionInfo() {
- List<JavaScriptExceptionInfo> exceptions =
- PrefServiceBridge.getInstance().getJavaScriptExceptions();
- if (!PrefServiceBridge.getInstance().javaScriptManaged()) {
+ public static List<ContentSettingException> getContentSettingsExceptions(
+ int contentSettingsType) {
+ List<ContentSettingException> exceptions =
+ PrefServiceBridge.getInstance().getContentSettingsExceptions(
+ contentSettingsType);
+ if (!PrefServiceBridge.getInstance().isContentSettingManaged(contentSettingsType)) {
return exceptions;
}
- List<JavaScriptExceptionInfo> managedExceptions = new ArrayList<JavaScriptExceptionInfo>();
- for (JavaScriptExceptionInfo exception : exceptions) {
- if (exception.getSource().equals("policy")) {
- managedExceptions.add(exception);
- }
- }
- return managedExceptions;
- }
-
- public static List<PopupExceptionInfo> getPopupExceptionInfo() {
- List<PopupExceptionInfo> exceptions =
- PrefServiceBridge.getInstance().getPopupExceptions();
- if (!PrefServiceBridge.getInstance().isPopupsManaged()) {
- return exceptions;
- }
-
- List<PopupExceptionInfo> managedExceptions = new ArrayList<PopupExceptionInfo>();
- for (PopupExceptionInfo exception : exceptions) {
+ List<ContentSettingException> managedExceptions =
+ new ArrayList<ContentSettingException>();
+ for (ContentSettingException exception : exceptions) {
if (exception.getSource().equals("policy")) {
managedExceptions.add(exception);
}

Powered by Google App Engine
This is Rietveld 408576698