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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.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/Website.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
index 1d8bfaade49bc0b315a80d6d5c60892a77678905..acf76fa368b00f3cc3c3d047e4e8662b801e5c4f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
@@ -29,6 +29,7 @@ public class Website implements Serializable {
private CameraInfo mCameraInfo;
private CookieInfo mCookieInfo;
private GeolocationInfo mGeolocationInfo;
+ private KeygenInfo mKeygenInfo;
private MicrophoneInfo mMicrophoneInfo;
private MidiInfo mMidiInfo;
private ContentSettingException mJavaScriptException;
@@ -133,6 +134,37 @@ public class Website implements Serializable {
}
/**
+ * Sets the KeygenInfo object for this Website.
+ */
+ public void setKeygenInfo(KeygenInfo info) {
+ mKeygenInfo = info;
+ WebsiteAddress embedder = WebsiteAddress.create(info.getEmbedder());
+ if (embedder != null) {
+ mSummary = embedder.getTitle();
+ }
+ }
+
+ public KeygenInfo getKeygenInfo() {
+ return mKeygenInfo;
+ }
+
+ /**
+ * Returns what permission governs keygen access.
+ */
+ public ContentSetting getKeygenPermission() {
+ return mKeygenInfo != null ? mKeygenInfo.getContentSetting() : null;
+ }
+
+ /**
+ * Configure keygen access setting for this site.
+ */
+ public void setKeygenPermission(ContentSetting value) {
+ if (mKeygenInfo != null) {
+ mKeygenInfo.setContentSetting(value);
+ }
+ }
+
+ /**
* Sets the MidiInfo object for this Website.
*/
public void setMidiInfo(MidiInfo info) {

Powered by Google App Engine
This is Rietveld 408576698