chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java - Issue 1929983002: Site Settings: Add Autoplay as a permission.

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

Issue 1929983002: Site Settings: Add Autoplay as a permission. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync to head Created 4 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

« 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/SingleCategoryPreferences.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/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 f25a59c27d96930f3390457104f2e520c1921d07..e3100c1369704af79dc8533617ffd829fdf1662e 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

@@ -87,6 +87,17 @@ public class ContentSettingsResources {

ThreadUtils.assertOnUiThread();

if (sResourceInfo == null) {

Map<Integer, ResourceItem> localMap = new HashMap<Integer, ResourceItem>();

+ localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_AUTOPLAY,

+ new ResourceItem(R.drawable.settings_autoplay, R.string.autoplay_title,

+ R.string.autoplay_title, ContentSetting.ALLOW,

+ ContentSetting.BLOCK,

+ R.string.website_settings_category_autoplay_allowed, 0));

+ localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,

+ new ResourceItem(R.drawable.permission_background_sync,

+ R.string.background_sync_permission_title,

+ R.string.background_sync_permission_title, ContentSetting.ALLOW,

+ ContentSetting.BLOCK,

+ R.string.website_settings_category_allowed_recommended, 0));

localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES,

new ResourceItem(R.drawable.permission_cookie, R.string.cookies_title,

R.string.cookies_title, ContentSetting.ALLOW, ContentSetting.BLOCK,

@@ -109,6 +120,12 @@ public class ContentSettingsResources {

R.string.javascript_permission_title, ContentSetting.ALLOW,

ContentSetting.BLOCK,

R.string.website_settings_category_allowed_recommended, 0));

+ localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN,

+ new ResourceItem(R.drawable.permission_keygen,

+ R.string.keygen_permission_title,

+ R.string.keygen_permission_title, ContentSetting.ALLOW,

+ ContentSetting.BLOCK,

+ 0, R.string.website_settings_category_blocked_recommended));

localMap.put(

ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,

new ResourceItem(R.drawable.permission_camera,

@@ -139,18 +156,6 @@ public class ContentSettingsResources {

org.chromium.chrome.R.string.protected_content,

ContentSetting.ASK, ContentSetting.BLOCK, 0, 0));

- localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN,

- new ResourceItem(R.drawable.permission_keygen,

- R.string.keygen_permission_title,

- R.string.keygen_permission_title, ContentSetting.ALLOW,

- ContentSetting.BLOCK,

- 0, R.string.website_settings_category_blocked_recommended));

- localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,

- new ResourceItem(R.drawable.permission_background_sync,

- R.string.background_sync_permission_title,

- R.string.background_sync_permission_title, ContentSetting.ALLOW,

- ContentSetting.BLOCK,

- R.string.website_settings_category_allowed_recommended, 0));

sResourceInfo = localMap;

}

return sResourceInfo;