| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
|
| index 6aeb76df132dcd9561ab85516718726a297d5351..9f17a973777226a70506e36795c5a32b4b50acfc 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
|
| @@ -23,6 +23,8 @@ public class ContentSettingsResources {
|
| return R.drawable.permission_fullscreen;
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION:
|
| return R.drawable.permission_location;
|
| + case ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES:
|
| + return R.drawable.permission_images;
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:
|
| return R.drawable.permission_javascript;
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM:
|
| @@ -52,6 +54,8 @@ public class ContentSettingsResources {
|
| return R.string.website_settings_fullscreen;
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION:
|
| return R.string.website_settings_device_location;
|
| + case ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES:
|
| + return R.string.images_permission_title;
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:
|
| return R.string.javascript_permission_title;
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM:
|
| @@ -79,6 +83,8 @@ public class ContentSettingsResources {
|
| return R.string.fullscreen_permission_title;
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION:
|
| return R.string.geolocation_permission_title;
|
| + case ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES:
|
| + return R.string.images_permission_title;
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:
|
| return R.string.javascript_permission_title;
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
|
| @@ -101,6 +107,7 @@ public class ContentSettingsResources {
|
| switch (contentType) {
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES:
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN:
|
| + case ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES:
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS:
|
| return ContentSetting.ALLOW;
|
| @@ -125,6 +132,7 @@ public class ContentSettingsResources {
|
| return ContentSetting.ASK;
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES:
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION:
|
| + case ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES:
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM:
|
| case ContentSettingsType.CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
|
|
|