Adding <keygen> Content Setting (Android UI)

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.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.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ skipping 20 matching lines @@
  * A base class for dealing with website settings categories.
  */
 public class SiteSettingsCategory {
     // Valid values for passing to fromString() in this class.
     public static final String CATEGORY_ALL_SITES = "all_sites";
     public static final String CATEGORY_CAMERA = "camera";
     public static final String CATEGORY_COOKIES = "cookies";
     public static final String CATEGORY_DEVICE_LOCATION = "device_location";
     public static final String CATEGORY_FULLSCREEN = "fullscreen";
     public static final String CATEGORY_JAVASCRIPT = "javascript";
+    public static final String CATEGORY_KEYGEN = "keygen";
     public static final String CATEGORY_MICROPHONE = "microphone";
     public static final String CATEGORY_POPUPS = "popups";
     public static final String CATEGORY_PROTECTED_MEDIA = "protected_content";
     public static final String CATEGORY_NOTIFICATIONS = "notifications";
     public static final String CATEGORY_USE_STORAGE = "use_storage";
 
     // The id of this category.
     private String mCategory;
 
     // The id of a permission in Android M that governs this category. Can be blank if Android has
@@ skipping 35 matching lines @@
                     ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
         }
         if (CATEGORY_COOKIES.equals(category)) {
             return new SiteSettingsCategory(CATEGORY_COOKIES, "",
                     ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES);
         }
         if (CATEGORY_JAVASCRIPT.equals(category)) {
             return new SiteSettingsCategory(CATEGORY_JAVASCRIPT, "",
                     ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT);
         }
+        if (CATEGORY_KEYGEN.equals(category)) {
+            return new SiteSettingsCategory(CATEGORY_KEYGEN, "",
+                    ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN);
+        }
         if (CATEGORY_DEVICE_LOCATION.equals(category)) {
             return new LocationCategory();
         }
         if (CATEGORY_FULLSCREEN.equals(category)) {
             return new SiteSettingsCategory(CATEGORY_FULLSCREEN, "",
                     ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN);
         }
         if (CATEGORY_MICROPHONE.equals(category)) {
             return new SiteSettingsCategory(
                     SiteSettingsCategory.CATEGORY_MICROPHONE,
@@ skipping 27 matching lines @@
     public static SiteSettingsCategory fromContentSettingsType(int contentSettingsType) {
         if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
             return fromString(CATEGORY_CAMERA);
         }
         if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES) {
             return fromString(CATEGORY_COOKIES);
         }
         if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT) {
             return fromString(CATEGORY_JAVASCRIPT);
         }
+        if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN) {
+            return fromString(CATEGORY_KEYGEN);
+        }
         if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION) {
             return fromString(CATEGORY_DEVICE_LOCATION);
         }
         if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN) {
             return fromString(CATEGORY_FULLSCREEN);
         }
         if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
             return fromString(CATEGORY_MICROPHONE);
         }
         if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS) {
@@ skipping 54 matching lines @@
     }
 
     /**
      * Returns whether this category is the JavaScript category.
      */
     public boolean showJavaScriptSites() {
         return mContentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT;
     }
 
     /**
+     * Returns whether this category is the Keygen category.
+     */
+    public boolean showKeygenSites() {
+        return mContentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN;
+    }
+
+    /**
      * Returns whether this category is the Microphone category.
      */
     public boolean showMicrophoneSites() {
         return mContentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC;
     }
 
     /**
      * Returns whether this category is the Popup category.
      */
     public boolean showPopupSites() {
@@ skipping 29 matching lines @@
      */
     public boolean isManaged() {
         PrefServiceBridge prefs = PrefServiceBridge.getInstance();
         if (showCameraSites()) return !prefs.isCameraUserModifiable();
         if (showCookiesSites()) return prefs.isAcceptCookiesManaged();
         if (showFullscreenSites()) return prefs.isFullscreenManaged();
         if (showGeolocationSites()) {
             return !prefs.isAllowLocationUserModifiable();
         }
         if (showJavaScriptSites()) return prefs.javaScriptManaged();
+        if (showKeygenSites()) return prefs.keygenManaged();

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

I don't think you need any of these changes if you just want to show the
permission on the site details page.

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

Done.

         if (showMicrophoneSites()) return !prefs.isMicUserModifiable();
         if (showPopupSites()) return prefs.isPopupsManaged();
         return false;
     }
 
     /**
      * Returns whether the current category is managed by the custodian (e.g. parent, not an
      * enterprise admin) of the account if the account is supervised.
      */
     public boolean isManagedByCustodian() {
@@ skipping 160 matching lines @@
      * Returns whether a per-app permission is enabled.
      * @param permission The string of the permission to check.
      */
     private boolean permissionOnInAndroid(String permission, Context context) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return true;
 
         return PackageManager.PERMISSION_GRANTED == context.getPackageManager().checkPermission(
                 permission, context.getPackageName());
     }
 }