| 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..84e21a8367a48b9928c13fcf0d2f9a91705b686f 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
|
| @@ -32,6 +32,7 @@ public class Website implements Serializable {
|
| private MicrophoneInfo mMicrophoneInfo;
|
| private MidiInfo mMidiInfo;
|
| private ContentSettingException mJavaScriptException;
|
| + private ContentSettingException mKeygenException;
|
| private ContentSettingException mPopupException;
|
| private ProtectedMediaIdentifierInfo mProtectedMediaIdentifierInfo;
|
| private PushNotificationInfo mPushNotificationInfo;
|
| @@ -188,6 +189,29 @@ public class Website implements Serializable {
|
| }
|
|
|
| /**
|
| + * Returns what permission governs Keygen access.
|
| + */
|
| + public ContentSetting getKeygenPermission() {
|
| + return mKeygenException != null ? mKeygenException.getContentSetting() : null;
|
| + }
|
| +
|
| + /**
|
| + * Configure Keygen permission access setting for this site.
|
| + */
|
| + public void setKeygenPermission(ContentSetting value) {
|
| + if (mKeygenException != null) {
|
| + mKeygenException.setContentSetting(value);
|
| + }
|
| + }
|
| +
|
| + /**
|
| + * Sets the Keygen exception info for this Website.
|
| + */
|
| + public void setKeygenException(ContentSettingException exception) {
|
| + mKeygenException = exception;
|
| + }
|
| +
|
| + /**
|
| * Sets the Popup exception info for this Website.
|
| */
|
| public void setPopupException(ContentSettingException exception) {
|
|
|