Restore the permission selection listing in the Origin Info Bubble.
There was going to be a replacement UI, but it never materialized, so restore
the ready-to-hand functionality.
BUG=483899
Review URL: https://codereview.chromium.org/1766493002
Cr-Commit-Position: refs/heads/master@{#380227}
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 755a01d0..9996abb 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -698,13 +698,14 @@
NULL);
}
- if ((permission_info.setting != CONTENT_SETTING_DEFAULT &&
- permission_info.setting != permission_info.default_setting) ||
- (permission_info.type == CONTENT_SETTINGS_TYPE_KEYGEN &&
- tab_specific_content_settings()->IsContentBlocked(
- permission_info.type))) {
- permission_info_list.push_back(permission_info);
+ 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);
}
for (const ChooserUIInfo& ui_info : kChooserUIInfo) {
