Adding <keygen> Content Setting (Android UI)

chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

 // Copyright 2013 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;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 417 matching lines @@
      * @param permission A valid ContentSettingsType that can be displayed in the PageInfo dialog to
      *                   retrieve the image for.
      * @return The resource ID of the icon to use for that permission.
      */
     private int getImageResourceForPermission(int permission) {
         switch (permission) {
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES:
                 return R.drawable.permission_images;
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:
                 return R.drawable.permission_javascript;
+            case ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN:
+                return R.drawable.permission_javascript;

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

Same image as javascript? Please run that by Rebecca.

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

Acknowledged.

             case ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION:
                 return R.drawable.permission_location;
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
                 return R.drawable.permission_camera;
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
                 return R.drawable.permission_mic;
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
                 return R.drawable.permission_push_notification;
             case ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS:
                 return R.drawable.permission_popups;
@@ skipping 415 matching lines @@
         new WebsiteSettingsPopup(activity, profile, webContents);
     }
 
     private static native long nativeInit(WebsiteSettingsPopup popup, WebContents webContents);
 
     private native void nativeDestroy(long nativeWebsiteSettingsPopupAndroid);
 
     private native void nativeOnPermissionSettingChanged(long nativeWebsiteSettingsPopupAndroid,
             int type, int setting);
 }