Adding <keygen> Content Setting (Android UI)

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

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
index 59ed158f02ce5d3066273fcffa760f840ce85c14..c03a6a4c744764c625b938566c47517ea722753d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
@@ -34,6 +34,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
     static final String LOCATION_KEY = "device_location";
     static final String MICROPHONE_KEY = "microphone";
     static final String JAVASCRIPT_KEY = "javascript";
+    static final String KEYGEN_KEY = "keygen";
     static final String BLOCK_POPUPS_KEY = "block_popups";
     static final String NOTIFICATIONS_KEY = "notifications";
     static final String POPUPS_KEY = "popups";
@@ -66,6 +67,8 @@ public class SiteSettingsPreferences extends PreferenceFragment
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC;
         } else if (JAVASCRIPT_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT;
+        } else if (KEYGEN_KEY.equals(key)) {
+            return ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN;
         } else if (NOTIFICATIONS_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
         } else if (POPUPS_KEY.equals(key)) {
@@ -89,6 +92,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
         websitePrefs.add(CAMERA_KEY);
         websitePrefs.add(FULLSCREEN_KEY);
         websitePrefs.add(JAVASCRIPT_KEY);
+        websitePrefs.add(KEYGEN_KEY);
         websitePrefs.add(MICROPHONE_KEY);
         websitePrefs.add(NOTIFICATIONS_KEY);
         websitePrefs.add(POPUPS_KEY);
@@ -103,6 +107,8 @@ public class SiteSettingsPreferences extends PreferenceFragment
                 checked = PrefServiceBridge.getInstance().isCameraEnabled();
             } else if (JAVASCRIPT_KEY.equals(prefName)) {
                 checked = PrefServiceBridge.getInstance().javaScriptEnabled();
+            } else if (KEYGEN_KEY.equals(prefName)) {
+                checked = PrefServiceBridge.getInstance().keygenEnabled();

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

I don't think you need any of these changes either.

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

Done.

             } else if (MICROPHONE_KEY.equals(prefName)) {
                 checked = PrefServiceBridge.getInstance().isMicEnabled();
             } else if (PROTECTED_CONTENT_KEY.equals(prefName)) {