chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java - Issue 1068223002: Implement Site Settings \ Images category.

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

Issue 1068223002: Implement Site Settings \ Images category. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address feedback + cleanup 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

« chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingExceptionInfo.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingExceptionInfo.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java

index 4f11ed00cc59e227409fe187cb7722cdc10c0de6..78175444f84350aa0f6783934d20ac030695d697 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java

@@ -27,6 +27,7 @@ public class ContentPreferences extends PreferenceFragment

static final String ALL_SITES_KEY = "website_settings";

static final String COOKIES_KEY = "cookies";

static final String FULLSCREEN_KEY = "fullscreen";

+ static final String IMAGES_KEY = "images";

static final String LOCATION_KEY = "device_location";

static final String CAMERA_AND_MIC_KEY = "use_camera_or_mic";

static final String JAVASCRIPT_KEY = "javascript";

@@ -59,6 +60,8 @@ public class ContentPreferences extends PreferenceFragment

return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION;

} else if (CAMERA_AND_MIC_KEY.equals(key)) {

return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM;

+ } else if (IMAGES_KEY.equals(key)) {

+ return ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES;

} else if (JAVASCRIPT_KEY.equals(key)) {

return ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT;

} else if (PUSH_NOTIFICATIONS_KEY.equals(key)) {

@@ -89,6 +92,7 @@ public class ContentPreferences extends PreferenceFragment

websitePrefs.add(COOKIES_KEY);

websitePrefs.add(CAMERA_AND_MIC_KEY);

websitePrefs.add(FULLSCREEN_KEY);

+ websitePrefs.add(IMAGES_KEY);

websitePrefs.add(JAVASCRIPT_KEY);

websitePrefs.add(PUSH_NOTIFICATIONS_KEY);

websitePrefs.add(POPUPS_KEY);

@@ -100,12 +104,14 @@ public class ContentPreferences extends PreferenceFragment

Website.PermissionDataEntry entry =

Website.PermissionDataEntry.getPermissionDataEntry(type);

boolean checked = false;

- if (LOCATION_KEY.equals(p.getKey())) {

+ if (LOCATION_KEY.equals(prefName)) {

checked = LocationSettings.getInstance().areAllLocationSettingsEnabled();

} else if (CAMERA_AND_MIC_KEY.equals(prefName)) {

checked = PrefServiceBridge.getInstance().isCameraMicEnabled();

} else if (JAVASCRIPT_KEY.equals(prefName)) {

checked = PrefServiceBridge.getInstance().javaScriptEnabled();

+ } else if (IMAGES_KEY.equals(prefName)) {

+ checked = PrefServiceBridge.getInstance().imagesEnabled();

} else if (PROTECTED_CONTENT_KEY.equals(prefName)) {

checked = PrefServiceBridge.getInstance().isProtectedMediaIdentifierEnabled();

} else if (COOKIES_KEY.equals(prefName)) {