Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4801)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java

Issue 1432573002: Adding <keygen> Content Setting (Android UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_ui
Patch Set: Trying tested code. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..cf3dc7b7eddae9cf451a4e8d98e50e224c70625a 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
@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.preferences.website;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+import org.chromium.content_public.browser.WebContents;
import java.util.ArrayList;
import java.util.HashMap;
@@ -42,6 +43,30 @@ 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 whether we've blocked key generation in the current tab.
+ */
+ @SuppressWarnings("unchecked")
+ public static boolean getKeygenBlocked(WebContents webContents) {
+ return nativeGetKeygenBlocked(webContents);
+ }
+
+ /**
* @return the list of all origins that have geolocation permissions in non-incognito mode.
*/
@SuppressWarnings("unchecked")
@@ -247,6 +272,12 @@ 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 boolean nativeGetKeygenBlocked(Object webContents);
private static native void nativeGetMidiOrigins(Object list);
static native int nativeGetMidiSettingForOrigin(
String origin, String embedder, boolean isIncognito);

Powered by Google App Engine
This is Rietveld 408576698