Adding AMD and AMDX policy for configuring extension install blacklist and whitelist.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/3159005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55728 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 67 insertions, 1 deletions

diff --git a/chrome/app/policy/windows/adm/en-US/chrome.adm b/chrome/app/policy/windows/adm/en-US/chrome.adm
index f2b8868..94d80b9 100644
--- a/chrome/app/policy/windows/adm/en-US/chrome.adm
+++ b/chrome/app/policy/windows/adm/en-US/chrome.adm
@@ -158,6 +158,31 @@ CLASS MACHINE
               VALUENAME "ProxyBypassList"

            END PART

        END POLICY

+

+       POLICY !!ExtensionInstallBlacklist

+           #if version >= 4

+             SUPPORTED !!SUPPORTED_WINXPSP2

+           #endif

+           EXPLAIN !!ExtensionInstallBlacklist_Explain

+           KEYNAME "Software\Policies\Google\Chrome\ExtensionInstallBlacklist"

+

+           PART !!ExtensionInstallBlacklistDesc LISTBOX

+              VALUEPREFIX " "

+           END PART

+       END POLICY

+

+       POLICY !!ExtensionInstallWhitelist

+           #if version >= 4

+             SUPPORTED !!SUPPORTED_WINXPSP2

+           #endif

+           EXPLAIN !!ExtensionInstallWhitelist_Explain

+           KEYNAME "Software\Policies\Google\Chrome\ExtensionInstallWhitelist"

+

+           PART !!ExtensionInstallWhitelistDesc LISTBOX

+              VALUEPREFIX " "

+           END PART

+       END POLICY

+

     END CATEGORY

   END CATEGORY

 

@@ -194,6 +219,15 @@ ProxyServerManual="Manually specify proxy settings"
 ProxyServerUseSystem="Use system proxy settings"

 ProxyBypassList="Comma-separated list of bypass rules:"

 ProxyPacUrl="URL to a proxy .pac file:"

+ExtensionInstallBlacklist="Configure extension installation blacklist"

+ExtensionInstallWhitelist="Configure extension installation whitelist"

+ExtensionInstallBlacklist_Explain="Allows you to specify which extensions the users can NOT install.\n\n\

+A blacklist value of * means all extensions are blacklisted and users will only be able to install extensions listed in the whitelist."

+ExtensionInstallWhitelist_Explain="Allows you to specify which extensions are not subject to the blacklist.\n\n\

+A blacklist value of * means all extensions are blacklisted and users will only be able to install extensions listed in the whitelist.\n\n\

+By default, all extensions are whitelisted, but if all extensions have been blacklisted by policy, the whitelist can be used to override that policy."

+ExtensionInstallBlacklistDesc="Specify extension ids the user should be prevented from installing (or * for all)."

+ExtensionInstallWhitelistDesc="Specify extension ids to excempt from the blacklist."

 AlternateErrorPagesEnabled="Enable alternate error pages"

 AlternateErrorPagesEnabled_Explain="Enables the use of alternate error pages that are built \

 into Google Chrome (such as 'page not found') and prevents users from changing this setting.\n\n\

diff --git a/chrome/app/policy/windows/admx/chrome.admx b/chrome/app/policy/windows/admx/chrome.admx
index a68ae18..5d1e0e5 100644
--- a/chrome/app/policy/windows/admx/chrome.admx
+++ b/chrome/app/policy/windows/admx/chrome.admx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <policyDefinitions revision="1.0" schemaVersion="1.0">

   <policyNamespaces>

-    <target prefix="fullarmor" namespace="FullArmor.1a993c1c-0aa8-4a4b-973b-5422fac5d26a" />

+    <target prefix="fullarmor" namespace="FullArmor.f92fd19a-29d5-48fc-a383-f102e04485f4" />

     <using prefix="windows" namespace="Microsoft.Policies.Windows" />

   </policyNamespaces>

   <supersededAdm fileName="D:\src\chromium\src\chrome\app\policy\windows\adm\en-US\chrome.adm" />

@@ -153,5 +153,19 @@
         <text id="ProxyBypassList" valueName="ProxyBypassList" />

       </elements>

     </policy>

+    <policy name="ExtensionInstallBlacklist" class="Machine" displayName="$(string.ExtensionInstallBlacklist)" explainText="$(string.ExtensionInstallBlacklist_Explain)" presentation="$(presentation.ExtensionInstallBlacklist)" key="Software\Policies\Google\Chrome\ExtensionInstallBlacklist">

+      <parentCategory ref="googlechrome" />

+      <supportedOn ref="SUPPORTED_WINXPSP2" />

+      <elements>

+        <list id="ExtensionInstallBlacklistDesc" valuePrefix=" " />

+      </elements>

+    </policy>

+    <policy name="ExtensionInstallWhitelist" class="Machine" displayName="$(string.ExtensionInstallWhitelist)" explainText="$(string.ExtensionInstallWhitelist_Explain)" presentation="$(presentation.ExtensionInstallWhitelist)" key="Software\Policies\Google\Chrome\ExtensionInstallWhitelist">

+      <parentCategory ref="googlechrome" />

+      <supportedOn ref="SUPPORTED_WINXPSP2" />

+      <elements>

+        <list id="ExtensionInstallWhitelistDesc" valuePrefix=" " />

+      </elements>

+    </policy>

   </policies>

 </policyDefinitions>
\ No newline at end of file
diff --git a/chrome/app/policy/windows/admx/en-US/chrome.adml b/chrome/app/policy/windows/admx/en-US/chrome.adml
index ed799fe..900d882 100644
--- a/chrome/app/policy/windows/admx/en-US/chrome.adml
+++ b/chrome/app/policy/windows/admx/en-US/chrome.adml
@@ -44,6 +44,18 @@ If you enable this setting, Google Chrome ignores all proxy-related options spec
       <string id="ProxyServerUseSystem">Use system proxy settings</string>

       <string id="ProxyBypassList">Comma-separated list of bypass rules:</string>

       <string id="ProxyPacUrl">URL to a proxy .pac file:</string>

+      <string id="ExtensionInstallBlacklist">Configure extension installation blacklist</string>

+      <string id="ExtensionInstallWhitelist">Configure extension installation whitelist</string>

+      <string id="ExtensionInstallBlacklist_Explain">Allows you to specify which extensions the users can NOT install.

+

+A blacklist value of * means all extensions are blacklisted and users will only be able to install extensions listed in the whitelist.</string>

+      <string id="ExtensionInstallWhitelist_Explain">Allows you to specify which extensions are not subject to the blacklist.

+

+A blacklist value of * means all extensions are blacklisted and users will only be able to install extensions listed in the whitelist.

+

+By default, all extensions are whitelisted, but if all extensions have been blacklisted by policy, the whitelist can be used to override that policy.</string>

+      <string id="ExtensionInstallBlacklistDesc">Specify extension ids the user should be prevented from installing (or * for all).</string>

+      <string id="ExtensionInstallWhitelistDesc">Specify extension ids to excempt from the blacklist.</string>

       <string id="AlternateErrorPagesEnabled">Enable alternate error pages</string>

       <string id="AlternateErrorPagesEnabled_Explain">Enables the use of alternate error pages that are built into Google Chrome (such as 'page not found') and prevents users from changing this setting.

 

@@ -136,6 +148,12 @@ If you enable this setting, users cannot change or override this setting in Goog
           <label>Comma-separated list of bypass rules:</label>

         </textBox>

       </presentation>

+      <presentation id="ExtensionInstallBlacklist">

+        <listBox refId="ExtensionInstallBlacklistDesc">Specify extension ids the user should be prevented from installing (or * for all).</listBox>

+      </presentation>

+      <presentation id="ExtensionInstallWhitelist">

+        <listBox refId="ExtensionInstallWhitelistDesc">Specify extension ids to excempt from the blacklist.</listBox>

+      </presentation>

     </presentationTable>

   </resources>

 </policyDefinitionResources>
\ No newline at end of file