Restore the permission selection listing in the Origin Info Bubble.

chrome/browser/ui/website_settings/website_settings.cc

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 755a01d090287e12b9935363a335fb0fe0374415..0fc93accbb8c99732199168036ee64585a84b5c4 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -698,13 +698,12 @@ void WebsiteSettings::PresentSitePermissions() {
                                                       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 &&

[lgarron, 2016/03/04 22:32:55]

So, after some more testing, it seems that we want to preserve the
tab_specific_content_settings()->IsContentBlocked() condition, too.

In order to preserve the logic, but only apply it to <keygen>, we can move the
<keygen> check to a top-level conjunction.

Let's let
A = permission_info.setting == CONTENT_SETTING_DEFAULT
B = permission_info.setting == permission_info.default_setting
K = permission_info.type == CONTENT_SETTINGS_TYPE_KEYGEN
T = tab_specific_content_settings()->IsContentBlocked(
             permission_info.type

We have:
    if ((!A && !B) || (K && T))) { show }

We want:
    if (K && !((!A && !B) || T)) { continue }

By de Morgan, this is:
    if (K && (A || B) && !T) { continue }

Which is all a roundabout way of saying that adding a
!tab_specific_content_settings()->IsContentBlocked(permission_info.type) to the
conjunction matches the old behaviour for <keygen>.
That makes sense to me; we want to hide the permission only if:
- the permission is <keygen>,
- the permission is default, and
- there is no tab-specific permission (due to a <keygen> element on the page).

Could you add it back in?


    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.setting == CONTENT_SETTING_DEFAULT ||
+         permission_info.setting == permission_info.default_setting)) {
+      continue;
     }
+    permission_info_list.push_back(permission_info);
   }
 
   for (const ChooserUIInfo& ui_info : kChooserUIInfo) {