Adding <keygen> Content Setting (Android UI)

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

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..904f37da8fc9bf8d69ea95859b7e14398f4796a2 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;
             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:
@@ -110,6 +116,7 @@ public class ContentSettingsResources {
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES:
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN:
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:
+            case ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN:

[Finnur, 2015/11/05 20:44:41]

If you only want to show the permission in site details, then the global default
enabled value does not need to be specified (much like MIDI).

[svaldez, 2015/11/10 15:25:01]

Done.

             case ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS:
                 return ContentSetting.ALLOW;
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION:
@@ -135,6 +142,7 @@ public class ContentSettingsResources {
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES:
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION:
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:
+            case ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN:

[Finnur, 2015/11/05 20:44:41]

Ditto.

[svaldez, 2015/11/10 15:25:02]

Done.

             case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
@@ -215,6 +223,7 @@ public class ContentSettingsResources {
         switch (contentType) {
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN:
                 return R.string.website_settings_category_ask_first_recommended;
+            case ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN:

[Finnur, 2015/11/05 20:44:41]

Ditto (I think)...

[svaldez, 2015/11/10 15:25:02]

Done.

             case ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS:
                 return R.string.website_settings_category_blocked_recommended;
             default: