chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index ef8f209ecf356465075805f0649e9ef71e022ebe..ea01790cef7efbc4ac8695ea0ffd6f7828d50bd6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -233,21 +233,6 @@ are declared in build/common.gypi.
       <message name="IDS_PAGE_INFO_INFOBAR_BUTTON" desc="The string used in the infobar button allowing the user to reload the page directly from the infobar.">
         Reload
       </message>
-      <message name="IDS_PAGE_INFO_BUTTON_TEXT_ALLOWED_BY_POLICY" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to allow and managed by policy.">
-        Allow (by policy)
-      </message>
-      <message name="IDS_PAGE_INFO_BUTTON_TEXT_BLOCKED_BY_POLICY" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to block and managed by policy.">
-        Block (by policy)
-      </message>
-      <message name="IDS_PAGE_INFO_BUTTON_TEXT_ASK_BY_POLICY" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to ask and managed by policy.">
-        Ask (by policy)
-      </message>
-      <message name="IDS_PAGE_INFO_BUTTON_TEXT_ALLOWED_BY_EXTENSION" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to allow and managed by an extension.">
-        Allow (by extension)
-      </message>
-      <message name="IDS_PAGE_INFO_BUTTON_TEXT_BLOCKED_BY_EXTENSION" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to block and managed by an extension.">
-        Block (by extension)
-      </message>
       <message name="IDS_PAGE_INFO_BUTTON_TEXT_ALLOWED_BY_USER" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button was explicitly set to allow by the user.">
         Allow
       </message>
@@ -293,6 +278,15 @@ are declared in build/common.gypi.
       <message name="IDS_PAGE_INFO_PERMISSION_ASK" desc="The label used in the permissions dropdowns for the option that makes the browser asks for permission. ">
         ask
       </message>
+      <message name="IDS_WEBSITE_SETTINGS_PERMISSION_SET_BY_POLICY" desc="The label used underneath a permission listed in the Website Settings popup if the permission was explicitly set by the user's enterprise policy.">

[lgarron, 2017/03/29 05:49:26]

These should be called IDS_PAGE_INFO_* now.

Ideally they should also be added to pageinfo_strings.grdp, but feel free to
leave them here until https://crbug.com/663975

[Patti Lor, 2017/03/30 03:27:29]

Ah, thank you - lost in multiple rebases. Fixed, but left the strings in this
file. Out of curiousity, is there a reason why some of them are PAGE_INFO and
others are PAGEINFO?

[lgarron, 2017/04/05 00:37:46]

Historical inconsistency. I've been renaming constants and files to use
underscores whenever I touch them.

[Patti Lor, 2017/04/05 01:02:43]

Ah ok, they're all supposed to be PAGE_INFO. Thanks for the FYI :)

+        Set by enterprise policy

[lgarron, 2017/03/29 05:49:26]

I still have opinions about these strings, but I've brought it up on the email
thread.

[Patti Lor, 2017/03/30 03:27:29]

Changed this to use "Controlled by" as you suggested. Thanks!

[lgarron, 2017/04/05 00:37:46]

Sounds like these are still a bit up in the air, but I think "Controlled" is the
best choice for landing right now. Thanks. :-)

[Patti Lor, 2017/04/05 01:02:43]

Acknowledged.

+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_PERMISSION_SET_BY_EXTENSION" desc="The label used underneath a permission listed in the Website Settings popup if the permission was explicitly set by one of the user's extensions.">
+        Set by an extension
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_PERMISSION_AUTOMATICALLY_BLOCKED" desc="The label used underneath a permission listed in the Website Settings popup if the permission was blocked by Chrome on behalf of the user.">
+        Automatically blocked
+      </message>
       <message name="IDS_PAGE_INFO_TYPE_AUTOPLAY" desc="The label used for the autoplay permission controls in the Website Settings popup.">
         Autoplay
       </message>