Adding <keygen> Content Setting (Android UI)

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.preferences.website;
 
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
@@ skipping 16 matching lines @@
 public class SiteSettingsPreferences extends PreferenceFragment
         implements OnPreferenceClickListener {
     // The keys for each category shown on the Site Settings page.
     static final String ALL_SITES_KEY = "all_sites";
     static final String CAMERA_KEY = "camera";
     static final String COOKIES_KEY = "cookies";
     static final String FULLSCREEN_KEY = "fullscreen";
     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";
     static final String PROTECTED_CONTENT_KEY = "protected_content";
     static final String STORAGE_KEY = "use_storage";
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.site_settings_preferences);
@@ skipping 12 matching lines @@
         } else if (COOKIES_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES;
         } else if (FULLSCREEN_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN;
         } else if (LOCATION_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION;
         } else if (MICROPHONE_KEY.equals(key)) {
             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)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS;
         } else if (PROTECTED_CONTENT_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER;
         }
         return -1;
     }
 
     private void updatePreferenceStates() {
         PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
 
         // Preferences that navigate to Website Settings.
         List<String> websitePrefs = new ArrayList<String>();
         websitePrefs.add(LOCATION_KEY);
         if (Build.VERSION.SDK_INT >= 19) {
             websitePrefs.add(PROTECTED_CONTENT_KEY);
         }
         websitePrefs.add(COOKIES_KEY);
         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);
         // Initialize the summary and icon for all preferences that have an
         // associated content settings entry.
         for (String prefName : websitePrefs) {
             Preference p = findPreference(prefName);
             boolean checked = false;
             if (LOCATION_KEY.equals(prefName)) {
                 checked = LocationSettings.getInstance().areAllLocationSettingsEnabled();
             } else if (CAMERA_KEY.equals(prefName)) {
                 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)) {
                 checked = PrefServiceBridge.getInstance().isProtectedMediaIdentifierEnabled();
             } else if (COOKIES_KEY.equals(prefName)) {
                 checked = PrefServiceBridge.getInstance().isAcceptCookiesEnabled();
             } else if (NOTIFICATIONS_KEY.equals(prefName)) {
                 checked = PrefServiceBridge.getInstance().isPushNotificationsEnabled();
             } else if (POPUPS_KEY.equals(prefName)) {
                 checked = PrefServiceBridge.getInstance().popupsEnabled();
@@ skipping 32 matching lines @@
 
     @Override
     public boolean onPreferenceClick(Preference preference) {
         preference.getExtras().putString(
                 SingleCategoryPreferences.EXTRA_CATEGORY, preference.getKey());
         preference.getExtras().putString(SingleCategoryPreferences.EXTRA_TITLE,
                 preference.getTitle().toString());
         return false;
     }
 }