Adding <keygen> Content Setting (Android UI)

chrome/browser/android/preferences/website_preference_bridge.cc

 // 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.
 
 #include "chrome/browser/android/preferences/website_preference_bridge.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
@@ skipping 98 matching lines @@
             env, list, jorigin.obj(), jembedder.obj());
         break;
       case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
         Java_WebsitePreferenceBridge_insertCameraInfoIntoList(
             env, list, jorigin.obj(), jembedder.obj());
         break;
       case CONTENT_SETTINGS_TYPE_GEOLOCATION:
         Java_WebsitePreferenceBridge_insertGeolocationInfoIntoList(
             env, list, jorigin.obj(), jembedder.obj());
         break;
+      case CONTENT_SETTINGS_TYPE_KEYGEN:
+        Java_WebsitePreferenceBridge_insertKeygenInfoIntoList(
+            env, list, jorigin.obj(), jembedder.obj());
+        break;
       case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
         Java_WebsitePreferenceBridge_insertMidiInfoIntoList(
             env, list, jorigin.obj(), jembedder.obj());
         break;
       case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
         Java_WebsitePreferenceBridge_insertProtectedMediaIdentifierInfoIntoList(
             env, list, jorigin.obj(), jembedder.obj());
         break;
       case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
         Java_WebsitePreferenceBridge_insertPushNotificationIntoList(
@@ skipping 88 matching lines @@
     const JavaParamRef<jstring>& origin,
     const JavaParamRef<jstring>& embedder,
     jint value,
     jboolean is_incognito) {
   GURL embedder_url(ConvertJavaStringToUTF8(env, embedder));
   SetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_GEOLOCATION, origin,
                       ContentSettingsPattern::FromURLNoWildcard(embedder_url),
                       (ContentSetting) value, is_incognito);
 }
 
+static void GetKeygenOrigins(JNIEnv* env,
+                             const JavaParamRef<jclass>& clazz,
+                             const JavaParamRef<jobject>& list) {
+  GetOrigins(env, CONTENT_SETTINGS_TYPE_KEYGEN, list, false);
+}
+
+static jint GetKeygenSettingForOrigin(JNIEnv* env,
+                                      const JavaParamRef<jclass>& clazz,
+                                      const JavaParamRef<jstring>& origin,
+                                      const JavaParamRef<jstring>& embedder,
+                                      jboolean is_incognito) {
+  return GetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_KEYGEN, origin,
+                             embedder, is_incognito);
+}
+
+static void SetKeygenSettingForOrigin(JNIEnv* env,
+                                      const JavaParamRef<jclass>& clazz,
+                                      const JavaParamRef<jstring>& origin,
+                                      const JavaParamRef<jstring>& embedder,
+                                      jint value,
+                                      jboolean is_incognito) {
+  SetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_KEYGEN, origin,
+                      ContentSettingsPattern::Wildcard(),

[newt (away), 2015/12/15 00:10:01]

why not "ContentSettingsPattern::FromURLNoWildcard(embedder_url)" ?

[svaldez, 2015/12/15 21:45:57]

Done.

+                      (ContentSetting) value, is_incognito);
+}
+
 static void GetMidiOrigins(JNIEnv* env,
                            const JavaParamRef<jclass>& clazz,
                            const JavaParamRef<jobject>& list) {
   GetOrigins(env, CONTENT_SETTINGS_TYPE_MIDI_SYSEX, list, false);
 }
 
 static jint GetMidiSettingForOrigin(JNIEnv* env,
                                     const JavaParamRef<jclass>& clazz,
                                     const JavaParamRef<jstring>& origin,
                                     const JavaParamRef<jstring>& embedder,
@@ skipping 557 matching lines @@
   GURL url(ConvertJavaStringToUTF8(env, jorigin));
   scoped_refptr<SiteDataDeleteHelper> site_data_deleter(
       new SiteDataDeleteHelper(profile, url));
   site_data_deleter->Run();
 }
 
 // Register native methods
 bool RegisterWebsitePreferenceBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }