Adding <keygen> Content Setting (Android UI)

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.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.annotation.SuppressLint;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
@@ skipping 120 matching lines @@
                                  R.string.website_settings_category_ask_before_sending, 0));
             localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS,
                     new ResourceItem(R.drawable.permission_popups, R.string.popup_permission_title,
                                  R.string.popup_permission_title, ContentSetting.ALLOW,
                                  ContentSetting.BLOCK, 0,
                                  R.string.website_settings_category_blocked_recommended));
             localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
                     new ResourceItem(R.drawable.permission_protected_media,
                                  org.chromium.chrome.R.string.protected_content, 0,
                                  ContentSetting.ASK, ContentSetting.BLOCK, 0, 0));
+            localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN,
+                    new ResourceItem(R.drawable.permission_keygen,
+                                 R.string.keygen_permission_title,
+                                 R.string.keygen_permission_title, ContentSetting.ALLOW,
+                                 ContentSetting.BLOCK,
+                                 0, R.string.website_settings_category_blocked_recommended));
             sResourceInfo = localMap;
         }
         return sResourceInfo;
     }
 
     /**
      * Returns the ResourceItem for a ContentSettingsType.
      */
     private static ResourceItem getResourceItem(int contentType) {
         return getResourceInfo().get(contentType);
@@ skipping 104 matching lines @@
     }
 
     /**
      * Returns the summary for Cookie content settings when it is allowed
      * except for those from third party sources.
      */
     public static int getCookieAllowedExceptThirdPartySummary() {
         return R.string.website_settings_category_allowed_except_third_party;
     }
 }