chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.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/preferences/website/ContentSettingsResources.java

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

Patch Set: Fixing android typos. Created 5 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') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java » ('J')
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 4b6f8060e8213cb17bae31d0574e5c101fa0b47c..dd96516a0bd536c45093b1ec266daf5c1bf919c4 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

@@ -25,6 +25,8 @@ public class ContentSettingsResources {

return R.drawable.permission_location;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:

return R.drawable.permission_javascript;

+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN:

+ return R.drawable.permission_javascript;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:

return R.drawable.permission_camera;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:

@@ -85,6 +87,8 @@ public class ContentSettingsResources {

return R.string.geolocation_permission_title;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:

return R.string.javascript_permission_title;

+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN:

+ return R.string.keygen_permission_title;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:

return R.string.camera_permission_title;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: