| 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 d4de32d9a2ecf6a4ce2b84fc443758e28faab5b6..a68ae18581de6e730c9ccf95684fb92c7ff9bbfa 100644
|
| --- a/chrome/app/policy/windows/admx/chrome.admx
|
| +++ b/chrome/app/policy/windows/admx/chrome.admx
|
| @@ -1,150 +1,157 @@
|
| -<?xml version="1.0" encoding="utf-8"?>
|
| -<policyDefinitions revision="1.0" schemaVersion="1.0">
|
| - <policyNamespaces>
|
| - <target prefix="fullarmor" namespace="FullArmor.3cca6b27-3c82-4689-8f0b-4ab08f8341da" />
|
| - <using prefix="windows" namespace="Microsoft.Policies.Windows" />
|
| - </policyNamespaces>
|
| - <supersededAdm fileName="C:\Development\src\chrome\app\policy\windows\adm\en-US\chrome.adm" />
|
| - <resources minRequiredRevision="1.0" />
|
| - <supportedOn>
|
| - <definitions>
|
| - <definition name="SUPPORTED_WINXPSP2" displayName="$(string.SUPPORTED_WINXPSP2)" />
|
| - <definition name="SUPPORTED_NotSpecified" displayName="$(string.ADMXMigrator_NoSupportedOn)" />
|
| - </definitions>
|
| - </supportedOn>
|
| - <categories>
|
| - <category name="google" displayName="$(string.google)" />
|
| - <category name="googlechrome" displayName="$(string.googlechrome)">
|
| - <parentCategory ref="google" />
|
| - </category>
|
| - </categories>
|
| - <policies>
|
| - <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>
|
| - <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\Chrome" valueName="AlternateErrorPagesEnabled">
|
| - <parentCategory ref="googlechrome" />
|
| - <supportedOn ref="SUPPORTED_WINXPSP2" />
|
| - <enabledValue>
|
| - <decimal value="1" />
|
| - </enabledValue>
|
| - <disabledValue>
|
| - <decimal value="0" />
|
| - </disabledValue>
|
| - </policy>
|
| - <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>
|
| - <decimal value="1" />
|
| - </enabledValue>
|
| - <disabledValue>
|
| - <decimal value="0" />
|
| - </disabledValue>
|
| - </policy>
|
| - <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>
|
| - <decimal value="1" />
|
| - </enabledValue>
|
| - <disabledValue>
|
| - <decimal value="0" />
|
| - </disabledValue>
|
| - </policy>
|
| - <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>
|
| - <decimal value="1" />
|
| - </enabledValue>
|
| - <disabledValue>
|
| - <decimal value="0" />
|
| - </disabledValue>
|
| - </policy>
|
| - <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>
|
| - <decimal value="1" />
|
| - </enabledValue>
|
| - <disabledValue>
|
| - <decimal value="0" />
|
| - </disabledValue>
|
| - </policy>
|
| - <policy name="PasswordManagerEnabled" class="Machine" displayName="$(string.PasswordManagerEnabled)" explainText="$(string.PasswordManagerEnabled_Explain)" presentation="$(presentation.PasswordManagerEnabled)" key="Software\Policies\Google\Chrome" valueName="PasswordManagerEnabled">
|
| - <parentCategory ref="googlechrome" />
|
| - <supportedOn ref="SUPPORTED_WINXPSP2" />
|
| - <enabledValue>
|
| - <decimal value="1" />
|
| - </enabledValue>
|
| - <disabledValue>
|
| - <decimal value="0" />
|
| - </disabledValue>
|
| - </policy>
|
| - <policy name="DisabledPlugins" class="Machine" displayName="$(string.DisabledPlugins)" explainText="$(string.DisabledPlugins_Explain)" presentation="$(presentation.DisabledPlugins)" key="Software\Policies\Google\Chrome" valueName="DisabledPlugins">
|
| - <parentCategory ref="googlechrome" />
|
| - <supportedOn ref="SUPPORTED_WINXPSP2" />
|
| - <enabledValue>
|
| - <decimal value="1" />
|
| - </enabledValue>
|
| - <disabledValue>
|
| - <decimal value="0" />
|
| - </disabledValue>
|
| - <elements>
|
| - <text id="DisabledPluginsList" valueName="DisabledPluginsList" />
|
| - </elements>
|
| - </policy>
|
| - <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\Chrome" valueName="Proxy">
|
| - <parentCategory ref="googlechrome" />
|
| - <supportedOn ref="SUPPORTED_WINXPSP2" />
|
| - <elements>
|
| - <enum id="ProxyServerMode" valueName="ProxyServerMode">
|
| - <item displayName="$(string.ProxyServerDisabled)">
|
| - <value>
|
| - <decimal value="0" />
|
| - </value>
|
| - </item>
|
| - <item displayName="$(string.ProxyServerAutoDetect)">
|
| - <value>
|
| - <decimal value="1" />
|
| - </value>
|
| - </item>
|
| - <item displayName="$(string.ProxyServerManual)">
|
| - <value>
|
| - <decimal value="2" />
|
| - </value>
|
| - </item>
|
| - <item displayName="$(string.ProxyServerUseSystem)">
|
| - <value>
|
| - <decimal value="3" />
|
| - </value>
|
| - </item>
|
| - </enum>
|
| - <text id="ProxyServer" valueName="ProxyServer" />
|
| - <text id="ProxyPacUrl" valueName="ProxyPacUrl" />
|
| - <text id="ProxyBypassList" valueName="ProxyBypassList" />
|
| - </elements>
|
| - </policy>
|
| - </policies>
|
| -</policyDefinitions>
|
| +<?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" />
|
| + <using prefix="windows" namespace="Microsoft.Policies.Windows" />
|
| + </policyNamespaces>
|
| + <supersededAdm fileName="D:\src\chromium\src\chrome\app\policy\windows\adm\en-US\chrome.adm" />
|
| + <resources minRequiredRevision="1.0" />
|
| + <supportedOn>
|
| + <definitions>
|
| + <definition name="SUPPORTED_WINXPSP2" displayName="$(string.SUPPORTED_WINXPSP2)" />
|
| + <definition name="SUPPORTED_NotSpecified" displayName="$(string.ADMXMigrator_NoSupportedOn)" />
|
| + </definitions>
|
| + </supportedOn>
|
| + <categories>
|
| + <category name="google" displayName="$(string.google)" />
|
| + <category name="googlechrome" displayName="$(string.googlechrome)">
|
| + <parentCategory ref="google" />
|
| + </category>
|
| + </categories>
|
| + <policies>
|
| + <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>
|
| + <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="ApplicationLocale" class="Machine" displayName="$(string.ApplicationLocale)" explainText="$(string.ApplicationLocale_Explain)" presentation="$(presentation.ApplicationLocale)" key="Software\Policies\Google\Chrome" valueName="ApplicationLocale">
|
| + <parentCategory ref="googlechrome" />
|
| + <supportedOn ref="SUPPORTED_WINXPSP2" />
|
| + <elements>
|
| + <text id="ApplicationLocaleValue" valueName="ApplicationLocaleValue" />
|
| + </elements>
|
| + </policy>
|
| + <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>
|
| + <decimal value="1" />
|
| + </enabledValue>
|
| + <disabledValue>
|
| + <decimal value="0" />
|
| + </disabledValue>
|
| + </policy>
|
| + <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>
|
| + <decimal value="1" />
|
| + </enabledValue>
|
| + <disabledValue>
|
| + <decimal value="0" />
|
| + </disabledValue>
|
| + </policy>
|
| + <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>
|
| + <decimal value="1" />
|
| + </enabledValue>
|
| + <disabledValue>
|
| + <decimal value="0" />
|
| + </disabledValue>
|
| + </policy>
|
| + <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>
|
| + <decimal value="1" />
|
| + </enabledValue>
|
| + <disabledValue>
|
| + <decimal value="0" />
|
| + </disabledValue>
|
| + </policy>
|
| + <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>
|
| + <decimal value="1" />
|
| + </enabledValue>
|
| + <disabledValue>
|
| + <decimal value="0" />
|
| + </disabledValue>
|
| + </policy>
|
| + <policy name="PasswordManagerEnabled" class="Machine" displayName="$(string.PasswordManagerEnabled)" explainText="$(string.PasswordManagerEnabled_Explain)" presentation="$(presentation.PasswordManagerEnabled)" key="Software\Policies\Google\Chrome" valueName="PasswordManagerEnabled">
|
| + <parentCategory ref="googlechrome" />
|
| + <supportedOn ref="SUPPORTED_WINXPSP2" />
|
| + <enabledValue>
|
| + <decimal value="1" />
|
| + </enabledValue>
|
| + <disabledValue>
|
| + <decimal value="0" />
|
| + </disabledValue>
|
| + </policy>
|
| + <policy name="DisabledPlugins" class="Machine" displayName="$(string.DisabledPlugins)" explainText="$(string.DisabledPlugins_Explain)" presentation="$(presentation.DisabledPlugins)" key="Software\Policies\Google\Chrome" valueName="DisabledPlugins">
|
| + <parentCategory ref="googlechrome" />
|
| + <supportedOn ref="SUPPORTED_WINXPSP2" />
|
| + <enabledValue>
|
| + <decimal value="1" />
|
| + </enabledValue>
|
| + <disabledValue>
|
| + <decimal value="0" />
|
| + </disabledValue>
|
| + <elements>
|
| + <text id="DisabledPluginsList" valueName="DisabledPluginsList" />
|
| + </elements>
|
| + </policy>
|
| + <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\Chrome" valueName="Proxy">
|
| + <parentCategory ref="googlechrome" />
|
| + <supportedOn ref="SUPPORTED_WINXPSP2" />
|
| + <elements>
|
| + <enum id="ProxyServerMode" valueName="ProxyServerMode">
|
| + <item displayName="$(string.ProxyServerDisabled)">
|
| + <value>
|
| + <decimal value="0" />
|
| + </value>
|
| + </item>
|
| + <item displayName="$(string.ProxyServerAutoDetect)">
|
| + <value>
|
| + <decimal value="1" />
|
| + </value>
|
| + </item>
|
| + <item displayName="$(string.ProxyServerManual)">
|
| + <value>
|
| + <decimal value="2" />
|
| + </value>
|
| + </item>
|
| + <item displayName="$(string.ProxyServerUseSystem)">
|
| + <value>
|
| + <decimal value="3" />
|
| + </value>
|
| + </item>
|
| + </enum>
|
| + <text id="ProxyServer" valueName="ProxyServer" />
|
| + <text id="ProxyPacUrl" valueName="ProxyPacUrl" />
|
| + <text id="ProxyBypassList" valueName="ProxyBypassList" />
|
| + </elements>
|
| + </policy>
|
| + </policies>
|
| +</policyDefinitions>
|
|
|