Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Side by Side Diff: chrome/app/policy/windows/admx/chrome.admx

Issue 2806040: Correct description in ADM/ADMX template and change registry key to "Chrome" from "Google Chrome" (Closed)
Patch Set: fix registry key name Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <policyDefinitions revision="1.0" schemaVersion="1.0"> 2 <policyDefinitions revision="1.0" schemaVersion="1.0">
3 <policyNamespaces> 3 <policyNamespaces>
4 <target prefix="fullarmor" namespace="FullArmor.a11efb4b-1ae1-445a-a00f-3a5a 41df8794" /> 4 <target prefix="fullarmor" namespace="FullArmor.4dd057b3-7d4f-4b0e-b832-fd4c d2c92884" />
5 <using prefix="windows" namespace="Microsoft.Policies.Windows" /> 5 <using prefix="windows" namespace="Microsoft.Policies.Windows" />
6 </policyNamespaces> 6 </policyNamespaces>
7 <supersededAdm fileName="C:\Development\src\chrome\app\policy\windows\adm\en-U S\chrome.adm" /> 7 <supersededAdm fileName="C:\Development\src\chrome\app\policy\windows\adm\en-U S\chrome.adm" />
8 <resources minRequiredRevision="1.0" /> 8 <resources minRequiredRevision="1.0" />
9 <supportedOn> 9 <supportedOn>
10 <definitions> 10 <definitions>
11 <definition name="SUPPORTED_WINXPSP2" displayName="$(string.SUPPORTED_WINX PSP2)" /> 11 <definition name="SUPPORTED_WINXPSP2" displayName="$(string.SUPPORTED_WINX PSP2)" />
12 <definition name="SUPPORTED_NotSpecified" displayName="$(string.ADMXMigrat or_NoSupportedOn)" /> 12 <definition name="SUPPORTED_NotSpecified" displayName="$(string.ADMXMigrat or_NoSupportedOn)" />
13 </definitions> 13 </definitions>
14 </supportedOn> 14 </supportedOn>
15 <categories> 15 <categories>
16 <category name="google" displayName="$(string.google)" /> 16 <category name="google" displayName="$(string.google)" />
17 <category name="googlechrome" displayName="$(string.googlechrome)"> 17 <category name="googlechrome" displayName="$(string.googlechrome)">
18 <parentCategory ref="google" /> 18 <parentCategory ref="google" />
19 </category> 19 </category>
20 </categories> 20 </categories>
21 <policies> 21 <policies>
22 <policy name="HomePage" class="Machine" displayName="$(string.HomePage)" exp lainText="$(string.HomePage_Explain)" presentation="$(presentation.HomePage)" ke y="Software\Policies\Google\Google Chrome" valueName="Homepage"> 22 <policy name="HomePage" class="Machine" displayName="$(string.HomePage)" exp lainText="$(string.HomePage_Explain)" presentation="$(presentation.HomePage)" ke y="Software\Policies\Google\Chrome" valueName="Homepage">
23 <parentCategory ref="googlechrome" /> 23 <parentCategory ref="googlechrome" />
24 <supportedOn ref="SUPPORTED_WINXPSP2" /> 24 <supportedOn ref="SUPPORTED_WINXPSP2" />
25 <elements> 25 <elements>
26 <text id="HomePageLocation" valueName="HomepageLocation" /> 26 <enum id="HomepageMode" valueName="HomepageIsNewTabPage">
27 <boolean id="HomePageIsNewTab" valueName="HomepageIsNewTabPage" /> 27 <item displayName="$(string.HomepageIsLocationURL)">
28 <value>
29 <decimal value="0" />
30 </value>
31 </item>
32 <item displayName="$(string.HomepageIsNewTabPage)">
33 <value>
34 <decimal value="1" />
35 </value>
36 </item>
37 </enum>
38 <text id="HomepageLocation" valueName="HomepageLocation" />
28 </elements> 39 </elements>
29 </policy> 40 </policy>
30 <policy name="AlternateErrorPagesEnabled" class="Machine" displayName="$(str ing.AlternateErrorPagesEnabled)" explainText="$(string.AlternateErrorPagesEnable d_Explain)" presentation="$(presentation.AlternateErrorPagesEnabled)" key="Softw are\Policies\Google\Google Chrome" valueName="AlternateErrorPagesEnabled"> 41 <policy name="AlternateErrorPagesEnabled" class="Machine" displayName="$(str ing.AlternateErrorPagesEnabled)" explainText="$(string.AlternateErrorPagesEnable d_Explain)" presentation="$(presentation.AlternateErrorPagesEnabled)" key="Softw are\Policies\Google\Chrome" valueName="AlternateErrorPagesEnabled">
31 <parentCategory ref="googlechrome" /> 42 <parentCategory ref="googlechrome" />
32 <supportedOn ref="SUPPORTED_WINXPSP2" /> 43 <supportedOn ref="SUPPORTED_WINXPSP2" />
33 <enabledValue> 44 <enabledValue>
34 <decimal value="1" /> 45 <decimal value="1" />
35 </enabledValue> 46 </enabledValue>
36 <disabledValue> 47 <disabledValue>
37 <decimal value="0" /> 48 <decimal value="0" />
38 </disabledValue> 49 </disabledValue>
39 </policy> 50 </policy>
40 <policy name="SearchSuggestEnabled" class="Machine" displayName="$(string.Se archSuggestEnabled)" explainText="$(string.SearchSuggestEnabled_Explain)" presen tation="$(presentation.SearchSuggestEnabled)" key="Software\Policies\Google\Goog le Chrome" valueName="SearchSuggestEnabled"> 51 <policy name="SearchSuggestEnabled" class="Machine" displayName="$(string.Se archSuggestEnabled)" explainText="$(string.SearchSuggestEnabled_Explain)" presen tation="$(presentation.SearchSuggestEnabled)" key="Software\Policies\Google\Chro me" valueName="SearchSuggestEnabled">
41 <parentCategory ref="googlechrome" /> 52 <parentCategory ref="googlechrome" />
42 <supportedOn ref="SUPPORTED_WINXPSP2" /> 53 <supportedOn ref="SUPPORTED_WINXPSP2" />
43 <enabledValue> 54 <enabledValue>
44 <decimal value="1" /> 55 <decimal value="1" />
45 </enabledValue> 56 </enabledValue>
46 <disabledValue> 57 <disabledValue>
47 <decimal value="0" /> 58 <decimal value="0" />
48 </disabledValue> 59 </disabledValue>
49 </policy> 60 </policy>
50 <policy name="DnsPrefetchingEnabled" class="Machine" displayName="$(string.D nsPrefetchingEnabled)" explainText="$(string.DnsPrefetchingEnabled_Explain)" pre sentation="$(presentation.DnsPrefetchingEnabled)" key="Software\Policies\Google\ Google Chrome" valueName="DnsPrefetchingEnabled"> 61 <policy name="DnsPrefetchingEnabled" class="Machine" displayName="$(string.D nsPrefetchingEnabled)" explainText="$(string.DnsPrefetchingEnabled_Explain)" pre sentation="$(presentation.DnsPrefetchingEnabled)" key="Software\Policies\Google\ Chrome" valueName="DnsPrefetchingEnabled">
51 <parentCategory ref="googlechrome" /> 62 <parentCategory ref="googlechrome" />
52 <supportedOn ref="SUPPORTED_WINXPSP2" /> 63 <supportedOn ref="SUPPORTED_WINXPSP2" />
53 <enabledValue> 64 <enabledValue>
54 <decimal value="1" /> 65 <decimal value="1" />
55 </enabledValue> 66 </enabledValue>
56 <disabledValue> 67 <disabledValue>
57 <decimal value="0" /> 68 <decimal value="0" />
58 </disabledValue> 69 </disabledValue>
59 </policy> 70 </policy>
60 <policy name="SafeBrowsingEnabled" class="Machine" displayName="$(string.Saf eBrowsingEnabled)" explainText="$(string.SafeBrowsingEnabled_Explain)" presentat ion="$(presentation.SafeBrowsingEnabled)" key="Software\Policies\Google\Google C hrome" valueName="SafeBrowsingEnabled"> 71 <policy name="SafeBrowsingEnabled" class="Machine" displayName="$(string.Saf eBrowsingEnabled)" explainText="$(string.SafeBrowsingEnabled_Explain)" presentat ion="$(presentation.SafeBrowsingEnabled)" key="Software\Policies\Google\Chrome" valueName="SafeBrowsingEnabled">
61 <parentCategory ref="googlechrome" /> 72 <parentCategory ref="googlechrome" />
62 <supportedOn ref="SUPPORTED_WINXPSP2" /> 73 <supportedOn ref="SUPPORTED_WINXPSP2" />
63 <enabledValue> 74 <enabledValue>
64 <decimal value="1" /> 75 <decimal value="1" />
65 </enabledValue> 76 </enabledValue>
66 <disabledValue> 77 <disabledValue>
67 <decimal value="0" /> 78 <decimal value="0" />
68 </disabledValue> 79 </disabledValue>
69 </policy> 80 </policy>
70 <policy name="MetricsReportingEnabled" class="Machine" displayName="$(string .MetricsReportingEnabled)" explainText="$(string.MetricsReportingEnabled_Explain )" presentation="$(presentation.MetricsReportingEnabled)" key="Software\Policies \Google\Google Chrome" valueName="MetricsReportingEnabled"> 81 <policy name="MetricsReportingEnabled" class="Machine" displayName="$(string .MetricsReportingEnabled)" explainText="$(string.MetricsReportingEnabled_Explain )" presentation="$(presentation.MetricsReportingEnabled)" key="Software\Policies \Google\Chrome" valueName="MetricsReportingEnabled">
71 <parentCategory ref="googlechrome" /> 82 <parentCategory ref="googlechrome" />
72 <supportedOn ref="SUPPORTED_WINXPSP2" /> 83 <supportedOn ref="SUPPORTED_WINXPSP2" />
73 <enabledValue> 84 <enabledValue>
74 <decimal value="1" /> 85 <decimal value="1" />
75 </enabledValue> 86 </enabledValue>
76 <disabledValue> 87 <disabledValue>
77 <decimal value="0" /> 88 <decimal value="0" />
78 </disabledValue> 89 </disabledValue>
79 </policy> 90 </policy>
80 <policy name="Sync" class="Machine" displayName="$(string.Sync)" explainText ="$(string.Sync_Explain)" presentation="$(presentation.Sync)" key="Software\Poli cies\Google\Google Chrome" valueName="SyncDisabled"> 91 <policy name="Sync" class="Machine" displayName="$(string.Sync)" explainText ="$(string.Sync_Explain)" presentation="$(presentation.Sync)" key="Software\Poli cies\Google\Chrome" valueName="SyncDisabled">
81 <parentCategory ref="googlechrome" /> 92 <parentCategory ref="googlechrome" />
82 <supportedOn ref="SUPPORTED_WINXPSP2" /> 93 <supportedOn ref="SUPPORTED_WINXPSP2" />
83 </policy> 94 </policy>
84 <policy name="Proxy" class="Machine" displayName="$(string.Proxy)" explainTe xt="$(string.Proxy_Explain)" presentation="$(presentation.Proxy)" key="Software\ Policies\Google\Google Chrome" valueName="Proxy"> 95 <policy name="Proxy" class="Machine" displayName="$(string.Proxy)" explainTe xt="$(string.Proxy_Explain)" presentation="$(presentation.Proxy)" key="Software\ Policies\Google\Chrome" valueName="Proxy">
85 <parentCategory ref="googlechrome" /> 96 <parentCategory ref="googlechrome" />
86 <supportedOn ref="SUPPORTED_WINXPSP2" /> 97 <supportedOn ref="SUPPORTED_WINXPSP2" />
87 <elements> 98 <elements>
88 <enum id="ProxyServerMode" valueName="ProxyServerMode"> 99 <enum id="ProxyServerMode" valueName="ProxyServerMode">
89 <item displayName="$(string.ProxyServerDisabled)"> 100 <item displayName="$(string.ProxyServerDisabled)">
90 <value> 101 <value>
91 <decimal value="0" /> 102 <decimal value="0" />
92 </value> 103 </value>
93 </item> 104 </item>
94 <item displayName="$(string.ProxyServerAutoDetect)"> 105 <item displayName="$(string.ProxyServerAutoDetect)">
(...skipping 11 matching lines...) Expand all
106 <decimal value="3" /> 117 <decimal value="3" />
107 </value> 118 </value>
108 </item> 119 </item>
109 </enum> 120 </enum>
110 <text id="ProxyServer" valueName="ProxyServer" /> 121 <text id="ProxyServer" valueName="ProxyServer" />
111 <text id="ProxyPacUrl" valueName="ProxyPacUrl" /> 122 <text id="ProxyPacUrl" valueName="ProxyPacUrl" />
112 <text id="ProxyBypassList" valueName="ProxyBypassList" /> 123 <text id="ProxyBypassList" valueName="ProxyBypassList" />
113 </elements> 124 </elements>
114 </policy> 125 </policy>
115 </policies> 126 </policies>
116 </policyDefinitions> 127 </policyDefinitions>
OLDNEW
« no previous file with comments | « chrome/app/policy/windows/adm/en-US/chrome.adm ('k') | chrome/app/policy/windows/admx/en-US/chrome.adml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698