chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java - Issue 2536993002: Remove support for the keygen tag

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/ContentSettingsResources.java

Issue 2536993002: Remove support for the keygen tag (Closed)

Patch Set: Rebased Created 4 years 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/res/xml/single_website_preferences.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/KeygenInfo.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 a110e3020b4032e0b060a4a38cff32d2cc80a317..6c148ea209088a8629119f8e7f37e456c0c162ee 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

@@ -118,12 +118,6 @@ public class ContentSettingsResources {

R.string.javascript_permission_title, ContentSetting.ALLOW,

ContentSetting.BLOCK,

R.string.website_settings_category_javascript_allowed, 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,