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 04602a2c04791e97aea6365376dd635698a89b57..ff2f30bdccc832eacdbf72cc8d0ba558cf184615 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"; |
@@ -82,16 +83,10 @@ public class SingleWebsitePreferences extends PreferenceFragment |
// All permissions from the permissions preference category must be listed here. |
// TODO(mvanouwerkerk): Use this array in more places to reduce verbosity. |
private static final String[] PERMISSION_PREFERENCE_KEYS = { |
- PREF_CAMERA_CAPTURE_PERMISSION, |
- PREF_COOKIES_PERMISSION, |
- PREF_FULLSCREEN_PERMISSION, |
- PREF_JAVASCRIPT_PERMISSION, |
- PREF_LOCATION_ACCESS, |
- PREF_MIC_CAPTURE_PERMISSION, |
- PREF_MIDI_SYSEX_PERMISSION, |
- PREF_POPUP_PERMISSION, |
- PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION, |
- PREF_PUSH_NOTIFICATIONS_PERMISSION, |
+ PREF_CAMERA_CAPTURE_PERMISSION, PREF_COOKIES_PERMISSION, PREF_FULLSCREEN_PERMISSION, |
+ PREF_JAVASCRIPT_PERMISSION, PREF_KEYGEN_PERMISSION, PREF_LOCATION_ACCESS, |
+ PREF_MIC_CAPTURE_PERMISSION, PREF_MIDI_SYSEX_PERMISSION, PREF_POPUP_PERMISSION, |
+ PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION, PREF_PUSH_NOTIFICATIONS_PERMISSION, |
Finnur
2015/12/11 17:53:05
Was this done by the git format command? I think t
svaldez
2015/12/11 18:13:10
Done.
|
}; |
// The website this page is displaying details about. |
@@ -193,6 +188,10 @@ public class SingleWebsitePreferences extends PreferenceFragment |
&& permissionInfoIsForTopLevelOrigin(other.getGeolocationInfo(), origin)) { |
merged.setGeolocationInfo(other.getGeolocationInfo()); |
} |
+ if (merged.getKeygenInfo() == null && other.getKeygenInfo() != null |
+ && permissionInfoIsForTopLevelOrigin(other.getKeygenInfo(), origin)) { |
+ merged.setKeygenInfo(other.getKeygenInfo()); |
+ } |
if (merged.getMidiInfo() == null && other.getMidiInfo() != null |
&& permissionInfoIsForTopLevelOrigin(other.getMidiInfo(), origin)) { |
merged.setMidiInfo(other.getMidiInfo()); |
@@ -284,6 +283,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 +509,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 +567,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 +621,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); |