| Index: chrome/browser/ui/website_settings/website_settings.cc
|
| diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
|
| index c15621855cad949db9f30a0a27022f2af93041ec..c9dae32d9c4bf20c068e3461332cc62e0b5aba7c 100644
|
| --- a/chrome/browser/ui/website_settings/website_settings.cc
|
| +++ b/chrome/browser/ui/website_settings/website_settings.cc
|
| @@ -107,7 +107,6 @@ ContentSettingsType kPermissionType[] = {
|
| #endif
|
| CONTENT_SETTINGS_TYPE_POPUPS,
|
| CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
|
| - CONTENT_SETTINGS_TYPE_KEYGEN,
|
| CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
|
| CONTENT_SETTINGS_TYPE_AUTOPLAY,
|
| CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
|
| @@ -730,13 +729,6 @@ void WebsiteSettings::PresentSitePermissions() {
|
| NULL);
|
| }
|
|
|
| - if (permission_info.type == CONTENT_SETTINGS_TYPE_KEYGEN &&
|
| - (permission_info.setting == CONTENT_SETTING_DEFAULT ||
|
| - permission_info.setting == permission_info.default_setting) &&
|
| - !tab_specific_content_settings()->IsContentBlocked(
|
| - permission_info.type)) {
|
| - continue;
|
| - }
|
| permission_info_list.push_back(permission_info);
|
| }
|
|
|
|
|