Index: chrome/app/policy/windows/admx/chrome.admx |
diff --git a/chrome/app/policy/windows/admx/chrome.admx b/chrome/app/policy/windows/admx/chrome.admx |
index cfe8429acbb1d034a2535653e2bbed47024fe6f6..1ccf04cd4c574f6986c64a81891e070e95b414d8 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.a11efb4b-1ae1-445a-a00f-3a5a41df8794" /> |
+ <target prefix="fullarmor" namespace="FullArmor.4dd057b3-7d4f-4b0e-b832-fd4cd2c92884" /> |
<using prefix="windows" namespace="Microsoft.Policies.Windows" /> |
</policyNamespaces> |
<supersededAdm fileName="C:\Development\src\chrome\app\policy\windows\adm\en-US\chrome.adm" /> |
@@ -19,15 +19,26 @@ |
</category> |
</categories> |
<policies> |
- <policy name="HomePage" class="Machine" displayName="$(string.HomePage)" explainText="$(string.HomePage_Explain)" presentation="$(presentation.HomePage)" key="Software\Policies\Google\Google Chrome" valueName="Homepage"> |
+ <policy name="HomePage" class="Machine" displayName="$(string.HomePage)" explainText="$(string.HomePage_Explain)" presentation="$(presentation.HomePage)" key="Software\Policies\Google\Chrome" valueName="Homepage"> |
<parentCategory ref="googlechrome" /> |
<supportedOn ref="SUPPORTED_WINXPSP2" /> |
<elements> |
- <text id="HomePageLocation" valueName="HomepageLocation" /> |
- <boolean id="HomePageIsNewTab" valueName="HomepageIsNewTabPage" /> |
+ <enum id="HomepageMode" valueName="HomepageIsNewTabPage"> |
+ <item displayName="$(string.HomepageIsLocationURL)"> |
+ <value> |
+ <decimal value="0" /> |
+ </value> |
+ </item> |
+ <item displayName="$(string.HomepageIsNewTabPage)"> |
+ <value> |
+ <decimal value="1" /> |
+ </value> |
+ </item> |
+ </enum> |
+ <text id="HomepageLocation" valueName="HomepageLocation" /> |
</elements> |
</policy> |
- <policy name="AlternateErrorPagesEnabled" class="Machine" displayName="$(string.AlternateErrorPagesEnabled)" explainText="$(string.AlternateErrorPagesEnabled_Explain)" presentation="$(presentation.AlternateErrorPagesEnabled)" key="Software\Policies\Google\Google Chrome" valueName="AlternateErrorPagesEnabled"> |
+ <policy name="AlternateErrorPagesEnabled" class="Machine" displayName="$(string.AlternateErrorPagesEnabled)" explainText="$(string.AlternateErrorPagesEnabled_Explain)" presentation="$(presentation.AlternateErrorPagesEnabled)" key="Software\Policies\Google\Chrome" valueName="AlternateErrorPagesEnabled"> |
<parentCategory ref="googlechrome" /> |
<supportedOn ref="SUPPORTED_WINXPSP2" /> |
<enabledValue> |
@@ -37,7 +48,7 @@ |
<decimal value="0" /> |
</disabledValue> |
</policy> |
- <policy name="SearchSuggestEnabled" class="Machine" displayName="$(string.SearchSuggestEnabled)" explainText="$(string.SearchSuggestEnabled_Explain)" presentation="$(presentation.SearchSuggestEnabled)" key="Software\Policies\Google\Google Chrome" valueName="SearchSuggestEnabled"> |
+ <policy name="SearchSuggestEnabled" class="Machine" displayName="$(string.SearchSuggestEnabled)" explainText="$(string.SearchSuggestEnabled_Explain)" presentation="$(presentation.SearchSuggestEnabled)" key="Software\Policies\Google\Chrome" valueName="SearchSuggestEnabled"> |
<parentCategory ref="googlechrome" /> |
<supportedOn ref="SUPPORTED_WINXPSP2" /> |
<enabledValue> |
@@ -47,7 +58,7 @@ |
<decimal value="0" /> |
</disabledValue> |
</policy> |
- <policy name="DnsPrefetchingEnabled" class="Machine" displayName="$(string.DnsPrefetchingEnabled)" explainText="$(string.DnsPrefetchingEnabled_Explain)" presentation="$(presentation.DnsPrefetchingEnabled)" key="Software\Policies\Google\Google Chrome" valueName="DnsPrefetchingEnabled"> |
+ <policy name="DnsPrefetchingEnabled" class="Machine" displayName="$(string.DnsPrefetchingEnabled)" explainText="$(string.DnsPrefetchingEnabled_Explain)" presentation="$(presentation.DnsPrefetchingEnabled)" key="Software\Policies\Google\Chrome" valueName="DnsPrefetchingEnabled"> |
<parentCategory ref="googlechrome" /> |
<supportedOn ref="SUPPORTED_WINXPSP2" /> |
<enabledValue> |
@@ -57,7 +68,7 @@ |
<decimal value="0" /> |
</disabledValue> |
</policy> |
- <policy name="SafeBrowsingEnabled" class="Machine" displayName="$(string.SafeBrowsingEnabled)" explainText="$(string.SafeBrowsingEnabled_Explain)" presentation="$(presentation.SafeBrowsingEnabled)" key="Software\Policies\Google\Google Chrome" valueName="SafeBrowsingEnabled"> |
+ <policy name="SafeBrowsingEnabled" class="Machine" displayName="$(string.SafeBrowsingEnabled)" explainText="$(string.SafeBrowsingEnabled_Explain)" presentation="$(presentation.SafeBrowsingEnabled)" key="Software\Policies\Google\Chrome" valueName="SafeBrowsingEnabled"> |
<parentCategory ref="googlechrome" /> |
<supportedOn ref="SUPPORTED_WINXPSP2" /> |
<enabledValue> |
@@ -67,7 +78,7 @@ |
<decimal value="0" /> |
</disabledValue> |
</policy> |
- <policy name="MetricsReportingEnabled" class="Machine" displayName="$(string.MetricsReportingEnabled)" explainText="$(string.MetricsReportingEnabled_Explain)" presentation="$(presentation.MetricsReportingEnabled)" key="Software\Policies\Google\Google Chrome" valueName="MetricsReportingEnabled"> |
+ <policy name="MetricsReportingEnabled" class="Machine" displayName="$(string.MetricsReportingEnabled)" explainText="$(string.MetricsReportingEnabled_Explain)" presentation="$(presentation.MetricsReportingEnabled)" key="Software\Policies\Google\Chrome" valueName="MetricsReportingEnabled"> |
<parentCategory ref="googlechrome" /> |
<supportedOn ref="SUPPORTED_WINXPSP2" /> |
<enabledValue> |
@@ -77,11 +88,11 @@ |
<decimal value="0" /> |
</disabledValue> |
</policy> |
- <policy name="Sync" class="Machine" displayName="$(string.Sync)" explainText="$(string.Sync_Explain)" presentation="$(presentation.Sync)" key="Software\Policies\Google\Google Chrome" valueName="SyncDisabled"> |
+ <policy name="Sync" class="Machine" displayName="$(string.Sync)" explainText="$(string.Sync_Explain)" presentation="$(presentation.Sync)" key="Software\Policies\Google\Chrome" valueName="SyncDisabled"> |
<parentCategory ref="googlechrome" /> |
<supportedOn ref="SUPPORTED_WINXPSP2" /> |
</policy> |
- <policy name="Proxy" class="Machine" displayName="$(string.Proxy)" explainText="$(string.Proxy_Explain)" presentation="$(presentation.Proxy)" key="Software\Policies\Google\Google Chrome" valueName="Proxy"> |
+ <policy name="Proxy" class="Machine" displayName="$(string.Proxy)" explainText="$(string.Proxy_Explain)" presentation="$(presentation.Proxy)" key="Software\Policies\Google\Chrome" valueName="Proxy"> |
<parentCategory ref="googlechrome" /> |
<supportedOn ref="SUPPORTED_WINXPSP2" /> |
<elements> |
@@ -113,4 +124,4 @@ |
</elements> |
</policy> |
</policies> |
-</policyDefinitions> |
+</policyDefinitions> |