| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java
|
| index f4ebb54545bd63cca5254834faf08ea49edcce57..efc311aa65a5b40b30cd73dd039f612ff77d13df 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java
|
| @@ -42,6 +42,22 @@ public abstract class WebsitePreferenceBridge {
|
| }
|
|
|
| /**
|
| + * @return the list of all origins that have keygen permissions in non-incognito mode.
|
| + */
|
| + @SuppressWarnings("unchecked")
|
| + public static List<KeygenInfo> getKeygenInfo() {
|
| + ArrayList<KeygenInfo> list = new ArrayList<KeygenInfo>();
|
| + nativeGetKeygenOrigins(list);
|
| + return list;
|
| + }
|
| +
|
| + @CalledByNative
|
| + private static void insertKeygenInfoIntoList(
|
| + ArrayList<KeygenInfo> list, String origin, String embedder) {
|
| + list.add(new KeygenInfo(origin, embedder, false));
|
| + }
|
| +
|
| + /**
|
| * @return the list of all origins that have geolocation permissions in non-incognito mode.
|
| */
|
| @SuppressWarnings("unchecked")
|
| @@ -247,6 +263,11 @@ public abstract class WebsitePreferenceBridge {
|
| String origin, String embedder, boolean isIncognito);
|
| public static native void nativeSetGeolocationSettingForOrigin(
|
| String origin, String embedder, int value, boolean isIncognito);
|
| + private static native void nativeGetKeygenOrigins(Object list);
|
| + static native int nativeGetKeygenSettingForOrigin(
|
| + String origin, String embedder, boolean isIncognito);
|
| + static native void nativeSetKeygenSettingForOrigin(
|
| + String origin, String embedder, int value, boolean isIncognito);
|
| private static native void nativeGetMidiOrigins(Object list);
|
| static native int nativeGetMidiSettingForOrigin(
|
| String origin, String embedder, boolean isIncognito);
|
|
|