Permissions: Show the reason for permission decisions made on the user's behalf.

chrome/browser/ui/page_info/website_settings_ui.cc

Index: chrome/browser/ui/page_info/website_settings_ui.cc
diff --git a/chrome/browser/ui/page_info/website_settings_ui.cc b/chrome/browser/ui/page_info/website_settings_ui.cc
index 487c6443673a8c1e0595078b02922db026ae38a3..64b2487863f01e79c3cc1db7b63dc89b013f87bc 100644
--- a/chrome/browser/ui/page_info/website_settings_ui.cc
+++ b/chrome/browser/ui/page_info/website_settings_ui.cc
@@ -6,6 +6,9 @@
 
 #include "base/macros.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_result.h"
+#include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/plugins/plugin_utils.h"
 #include "chrome/browser/plugins/plugins_field_trial.h"
 #include "chrome/common/chrome_features.h"
@@ -23,33 +26,6 @@ namespace {
 const int kInvalidResourceID = -1;
 
 // The resource IDs for the strings that are displayed on the permissions
-// button if the permission setting is managed by policy.
-const int kPermissionButtonTextIDPolicyManaged[] = {
-    kInvalidResourceID,
-    IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_POLICY,
-    IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_POLICY,
-    IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_POLICY,
-    kInvalidResourceID,
-    kInvalidResourceID};
-static_assert(arraysize(kPermissionButtonTextIDPolicyManaged) ==
-              CONTENT_SETTING_NUM_SETTINGS,
-              "kPermissionButtonTextIDPolicyManaged array size is incorrect");
-
-// The resource IDs for the strings that are displayed on the permissions
-// button if the permission setting is managed by an extension.
-const int kPermissionButtonTextIDExtensionManaged[] = {
-    kInvalidResourceID,
-    IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_EXTENSION,
-    IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_EXTENSION,
-    kInvalidResourceID,
-    kInvalidResourceID,
-    kInvalidResourceID};
-static_assert(arraysize(kPermissionButtonTextIDExtensionManaged) ==
-              CONTENT_SETTING_NUM_SETTINGS,
-              "kPermissionButtonTextIDExtensionManaged array size is "
-              "incorrect");
-
-// The resource IDs for the strings that are displayed on the permissions
 // button if the permission setting is managed by the user.
 const int kPermissionButtonTextIDUserManaged[] = {
     kInvalidResourceID,
@@ -261,16 +237,14 @@ base::string16 WebsiteSettingsUI::PermissionActionToUIString(
   const int* button_text_ids = NULL;
   switch (source) {
     case content_settings::SETTING_SOURCE_USER:
-      if (setting == CONTENT_SETTING_DEFAULT)
+      if (setting == CONTENT_SETTING_DEFAULT) {
         button_text_ids = kPermissionButtonTextIDDefaultSetting;
-      else
-        button_text_ids = kPermissionButtonTextIDUserManaged;
-      break;
+        break;
+      }
+    // Fallthrough.
     case content_settings::SETTING_SOURCE_POLICY:
-      button_text_ids = kPermissionButtonTextIDPolicyManaged;
-      break;
     case content_settings::SETTING_SOURCE_EXTENSION:
-      button_text_ids = kPermissionButtonTextIDExtensionManaged;
+      button_text_ids = kPermissionButtonTextIDUserManaged;
       break;
     case content_settings::SETTING_SOURCE_WHITELIST:
     case content_settings::SETTING_SOURCE_NONE:
@@ -284,6 +258,43 @@ base::string16 WebsiteSettingsUI::PermissionActionToUIString(
 }
 
 // static
+base::string16 WebsiteSettingsUI::PermissionDecisionReasonToString(
+    Profile* profile,
+    const WebsiteSettingsUI::PermissionInfo& permission,
+    const GURL& url) {
+  int message_id = kInvalidResourceID;
+  switch (permission.source) {
+    case content_settings::SettingSource::SETTING_SOURCE_POLICY:
+      message_id = IDS_WEBSITE_SETTINGS_PERMISSION_SET_BY_POLICY;
+      break;
+    case content_settings::SettingSource::SETTING_SOURCE_EXTENSION:
+      message_id = IDS_WEBSITE_SETTINGS_PERMISSION_SET_BY_EXTENSION;
+      break;
+    default:
+      break;
+  }
+
+  if (permission.setting == CONTENT_SETTING_BLOCK &&
+      PermissionUtil::IsPermission(permission.type)) {
+    PermissionResult permission_result =
+        PermissionManager::Get(profile)->GetPermissionStatus(permission.type,
+                                                             url, url);
+    switch (permission_result.source) {
+      case PermissionStatusSource::MULTIPLE_DISMISSALS:
+      case PermissionStatusSource::SAFE_BROWSING_BLACKLIST:
+        message_id = IDS_WEBSITE_SETTINGS_PERMISSION_AUTOMATICALLY_BLOCKED;
+        break;
+      default:
+        break;
+    }
+  }
+
+  if (message_id != kInvalidResourceID)

[dominickn, 2017/03/26 23:46:24]

Minor nit: I would flip the conditional to make it

if (message_id == kInvalidResourceID)
  return base::string16()

[Patti Lor, 2017/03/27 05:52:40]

Done.

+    return l10n_util::GetStringUTF16(message_id);
+  return base::string16();
+}
+
+// static
 int WebsiteSettingsUI::GetPermissionIconID(ContentSettingsType type,
                                            ContentSetting setting) {
   bool use_blocked = (setting == CONTENT_SETTING_BLOCK);