Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java |
index f41d8d3f7e2ab20bfc58d464fe2a95262c752e01..13d2e1d1df911148c83dad82f64b3eb6d14fefd1 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java |
@@ -70,6 +70,7 @@ public class SingleWebsitePreferences extends PreferenceFragment |
public static final String PREF_COOKIES_PERMISSION = "cookies_permission_list"; |
public static final String PREF_FULLSCREEN_PERMISSION = "fullscreen_permission_list"; |
public static final String PREF_JAVASCRIPT_PERMISSION = "javascript_permission_list"; |
+ public static final String PREF_KEYGEN_PERMISSION = "keygen_permission_list"; |
public static final String PREF_LOCATION_ACCESS = "location_access_list"; |
public static final String PREF_MIC_CAPTURE_PERMISSION = "microphone_permission_list"; |
public static final String PREF_MIDI_SYSEX_PERMISSION = "midi_sysex_permission_list"; |
@@ -86,6 +87,7 @@ public class SingleWebsitePreferences extends PreferenceFragment |
PREF_COOKIES_PERMISSION, |
PREF_FULLSCREEN_PERMISSION, |
PREF_JAVASCRIPT_PERMISSION, |
+ PREF_KEYGEN_PERMISSION, |
PREF_LOCATION_ACCESS, |
PREF_MIC_CAPTURE_PERMISSION, |
PREF_MIDI_SYSEX_PERMISSION, |
@@ -284,6 +286,8 @@ public class SingleWebsitePreferences extends PreferenceFragment |
setUpListPreference(preference, mSite.getFullscreenPermission()); |
} else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) { |
setUpListPreference(preference, mSite.getJavaScriptPermission()); |
+ } else if (PREF_KEYGEN_PERMISSION.equals(preference.getKey())) { |
+ setUpListPreference(preference, mSite.getKeygenPermission()); |
} else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) { |
setUpLocationPreference(preference); |
} else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) { |
@@ -508,6 +512,8 @@ public class SingleWebsitePreferences extends PreferenceFragment |
return ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN; |
case PREF_JAVASCRIPT_PERMISSION: |
return ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT; |
+ case PREF_KEYGEN_PERMISSION: |
+ return ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN; |
case PREF_LOCATION_ACCESS: |
return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION; |
case PREF_MIC_CAPTURE_PERMISSION: |
@@ -564,6 +570,8 @@ public class SingleWebsitePreferences extends PreferenceFragment |
mSite.setFullscreenPermission(permission); |
} else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) { |
mSite.setJavaScriptPermission(permission); |
+ } else if (PREF_KEYGEN_PERMISSION.equals(preference.getKey())) { |
+ mSite.setKeygenPermission(permission); |
} else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) { |
mSite.setGeolocationPermission(permission); |
} else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) { |
@@ -616,6 +624,7 @@ public class SingleWebsitePreferences extends PreferenceFragment |
mSite.setFullscreenPermission(ContentSetting.DEFAULT); |
mSite.setGeolocationPermission(ContentSetting.DEFAULT); |
mSite.setJavaScriptPermission(ContentSetting.DEFAULT); |
+ mSite.setKeygenPermission(ContentSetting.DEFAULT); |
mSite.setMicrophonePermission(ContentSetting.DEFAULT); |
mSite.setMidiPermission(ContentSetting.DEFAULT); |
mSite.setPopupPermission(ContentSetting.DEFAULT); |