Chromium Code Reviews| 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..e31bd08fec1f38d1651ce4cf5268d2a47de5092a 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<ContentSettingExceptionInfo> getContentSettingsExceptionInfo( |
|
newt (away)
2015/04/10 18:46:49
"getContentSettingsExceptions()"
Finnur
2015/04/13 12:59:32
Done.
|
| + int contentSettingsType) { |
| + List<ContentSettingExceptionInfo> 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<ContentSettingExceptionInfo> managedExceptions = |
| + new ArrayList<ContentSettingExceptionInfo>(); |
| + for (ContentSettingExceptionInfo exception : exceptions) { |
| if (exception.getSource().equals("policy")) { |
| managedExceptions.add(exception); |
| } |