chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java - Issue 1432573002: Adding <keygen> Content Setting (Android UI)

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

Issue 1432573002: Adding <keygen> Content Setting (Android UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_ui

Patch Set: Update UI strings. Created 5 years, 1 month 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 | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

index 0c1acb49fa20d53ad5f6c515affdac6b98f007d4..354573974ba5332617e78b6dd22a6c5ec790d0e7 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

@@ -435,6 +435,8 @@ public class WebsiteSettingsPopup implements OnClickListener {

return R.drawable.permission_images;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:

return R.drawable.permission_javascript;

+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN:

+ return R.drawable.permission_javascript;

Finnur 2015/11/05 20:44:40 Same image as javascript? Please run that by Rebec

svaldez 2015/11/10 15:25:01 Acknowledged.

case ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION:

return R.drawable.permission_location;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: