Index: components/policy/tools/template_writers/writer_configuration.py |
diff --git a/components/policy/tools/template_writers/writer_configuration.py b/components/policy/tools/template_writers/writer_configuration.py |
index 728a3cf09e4835b1cd8ccd497d02e2785a0da58d..554ea309c82fecf4f5ceb7eccef46e420519fe74 100755 |
--- a/components/policy/tools/template_writers/writer_configuration.py |
+++ b/components/policy/tools/template_writers/writer_configuration.py |
@@ -21,6 +21,9 @@ def GetConfigurationForBuild(defines): |
# admx: Only ADMX. |
# adm: Only ADM. |
# none/other: Used by all the writers. |
+ # Google:Cat_Google references the external google.admx file. |
+ # category_path_strings strings in curly braces are looked up from localized |
+ # 'messages' in policy_templates.json. |
if '_chromium' in defines: |
config = { |
'build': 'chromium', |
@@ -28,16 +31,34 @@ def GetConfigurationForBuild(defines): |
'frame_name': 'Chromium Frame', |
'os_name': 'Chromium OS', |
'webview_name': 'Chromium WebView', |
- 'win_reg_mandatory_key_name': 'Software\\Policies\\Chromium', |
- 'win_reg_recommended_key_name': |
- 'Software\\Policies\\Chromium\\Recommended', |
- 'win_mandatory_category_path': ['chromium'], |
- 'win_recommended_category_path': ['chromium_recommended'], |
- 'win_category_path_strings': { |
- 'chromium': 'Chromium', |
- 'chromium_recommended': 'Chromium - {doc_recommended}' |
+ 'win_config' : { |
+ 'win' : { |
+ 'reg_mandatory_key_name': |
+ 'Software\\Policies\\Chromium', |
+ 'reg_recommended_key_name': |
+ 'Software\\Policies\\Chromium\\Recommended', |
+ 'mandatory_category_path': ['chromium'], |
+ 'recommended_category_path': ['chromium_recommended'], |
+ 'category_path_strings': { |
+ 'chromium': 'Chromium', |
+ 'chromium_recommended': 'Chromium - {doc_recommended}', |
+ }, |
+ 'namespace': 'Chromium.Policies.Chromium', |
+ }, |
+ 'chrome_os' : { |
+ 'reg_mandatory_key_name': |
+ 'Software\\Policies\\ChromiumOS', |
+ 'reg_recommended_key_name': |
+ 'Software\\Policies\\ChromiumOS\\Recommended', |
+ 'mandatory_category_path': ['chromium_os'], |
+ 'recommended_category_path': ['chromium_os_recommended'], |
+ 'category_path_strings': { |
+ 'chromium_os': 'Chromium OS', |
+ 'chromium_os_recommended': 'Chromium OS - {doc_recommended}', |
+ }, |
+ 'namespace': 'Chromium.Policies.ChromiumOS' |
+ }, |
}, |
- 'admx_namespace': 'Chromium.Policies.Chromium', |
'admx_prefix': 'chromium', |
'linux_policy_path': '/etc/chromium/policies/', |
} |
@@ -48,24 +69,39 @@ def GetConfigurationForBuild(defines): |
'frame_name': 'Google Chrome Frame', |
'os_name': 'Google Chrome OS', |
'webview_name': 'Android System WebView', |
- 'win_reg_mandatory_key_name': 'Software\\Policies\\Google\\Chrome', |
- 'win_reg_recommended_key_name': |
- 'Software\\Policies\\Google\\Chrome\\Recommended', |
- # Note: Google:Cat_Google references Google.Policies from external |
- # in google.admx file. |
- 'win_mandatory_category_path': ['Google:Cat_Google', 'googlechrome'], |
- 'win_recommended_category_path': |
- ['Google:Cat_Google', 'googlechrome_recommended'], |
- 'win_category_path_strings': { |
- # Strings in curly braces is looked up from localized 'messages' in |
- # policy_templates.json. |
- 'googlechrome': 'Google Chrome', |
- 'googlechrome_recommended': 'Google Chrome - {doc_recommended}' |
+ 'win_config' : { |
+ 'win' : { |
+ 'reg_mandatory_key_name': |
+ 'Software\\Policies\\Google\\Chrome', |
+ 'reg_recommended_key_name': |
+ 'Software\\Policies\\Google\\Chrome\\Recommended', |
+ 'mandatory_category_path': ['Google:Cat_Google', 'googlechrome'], |
+ 'recommended_category_path': |
+ ['Google:Cat_Google', 'googlechrome_recommended'], |
+ 'category_path_strings': { |
+ 'googlechrome': 'Google Chrome', |
+ 'googlechrome_recommended': 'Google Chrome - {doc_recommended}' |
+ }, |
+ 'namespace': 'Google.Policies.Chrome', |
+ }, |
+ 'chrome_os' : { |
+ 'reg_mandatory_key_name': |
+ 'Software\\Policies\\Google\\ChromeOS', |
+ 'reg_recommended_key_name': |
+ 'Software\\Policies\\Google\\ChromeOS\\Recommended', |
+ 'mandatory_category_path': ['Google:Cat_Google', 'googlechromeos'], |
+ 'recommended_category_path': |
+ ['Google:Cat_Google', 'googlechromeos_recommended'], |
+ 'category_path_strings': { |
+ 'googlechromeos': 'Google Chrome OS', |
+ 'googlechromeos_recommended': 'Google Chrome OS - {doc_recommended}' |
+ }, |
+ 'namespace': 'Google.Policies.ChromeOS', |
+ }, |
}, |
# The string 'Google' is defined in google.adml for ADMX, but ADM doesn't |
# support external references, so we define this map here. |
- 'adm_category_path_strings': { 'Google:Cat_Google': 'Google' }, |
- 'admx_namespace': 'Google.Policies.Chrome', |
+ 'adm_category_path_strings': {'Google:Cat_Google': 'Google'}, |
'admx_prefix': 'chrome', |
'admx_using_namespaces': { |
'Google': 'Google.Policies' # prefix: namespace |
@@ -76,7 +112,6 @@ def GetConfigurationForBuild(defines): |
raise Exception('Unknown build') |
if 'version' in defines: |
config['version'] = defines['version'] |
- config['win_group_policy_class'] = 'Both' |
config['win_supported_os'] = 'SUPPORTED_WINXPSP2' |
if 'mac_bundle_id' in defines: |
config['mac_bundle_id'] = defines['mac_bundle_id'] |