| Index: chrome/browser/android/preferences/website_preference_bridge.cc
|
| diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc
|
| index e5d3fc4a85760ba77a304e55148c9d5e8057f104..561f535d9334b7755e40eb8ff4e1501665c8a354 100644
|
| --- a/chrome/browser/android/preferences/website_preference_bridge.cc
|
| +++ b/chrome/browser/android/preferences/website_preference_bridge.cc
|
| @@ -116,6 +116,10 @@ static void GetOrigins(JNIEnv* env,
|
| 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());
|
| @@ -224,6 +228,32 @@ static void SetGeolocationSettingForOrigin(
|
| (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(),
|
| + (ContentSetting) value, is_incognito);
|
| +}
|
| +
|
| static void GetMidiOrigins(JNIEnv* env,
|
| const JavaParamRef<jclass>& clazz,
|
| const JavaParamRef<jobject>& list) {
|
|
|