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

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 up permissions. (Still needs to be tested) 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 | « chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java » ('j') | chrome/android/java/strings/android_chrome_strings.grd » ('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..d8875fb939dde7f2b05fa3a7a4d6be2a55c2b0ad 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:

@@ -56,6 +58,8 @@ public class ContentSettingsResources {

return R.string.website_settings_device_location;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:

return R.string.javascript_permission_title;

+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN:

+ return R.string.keygen_permission_title;

Finnur 2015/11/11 10:25:45 This is not required by MIDI, so it should not be

svaldez 2015/11/19 17:50:25 Done.

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:

return R.string.website_settings_use_camera;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:

@@ -85,6 +89,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: