chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java - Issue 1221833002: Remove the Images category from Site Settings.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1221833002: Remove the Images category from Site Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java » ('j') | no next file with comments »
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 06c96637692c419e42bbb1d23d98da9ba1638bf3..42c5626aa90383ec0c9db61f93140a4eafd34cdd 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

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

static final String CAMERA_KEY = "camera";

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 MICROPHONE_KEY = "microphone";

static final String JAVASCRIPT_KEY = "javascript";

@@ -63,8 +62,6 @@ public class ContentPreferences extends PreferenceFragment

return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION;

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

return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC;

- } 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)) {

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

websitePrefs.add(COOKIES_KEY);

websitePrefs.add(CAMERA_KEY);

websitePrefs.add(FULLSCREEN_KEY);

- websitePrefs.add(IMAGES_KEY);

websitePrefs.add(JAVASCRIPT_KEY);

websitePrefs.add(MICROPHONE_KEY);

websitePrefs.add(PUSH_NOTIFICATIONS_KEY);

@@ -111,8 +107,6 @@ public class ContentPreferences extends PreferenceFragment

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

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

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

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

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

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

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

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