diff options
4 files changed, 8 insertions, 3 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index ad90ba6..89ca271 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -142,7 +142,7 @@ 'features': {'dynamic_refresh': 1}, 'example_value': True, } - }, + }, { 'name': 'JavascriptEnabled', 'type': 'main', @@ -504,8 +504,8 @@ 'name': 'ChromeOsLockOnIdleSuspend', 'type': 'main', 'annotations': { - 'platforms': ['linux'], # Note this should be ChromeOs. - 'products': ['chrome'], + 'platforms': ['chrome_os'], + 'products': ['chrome_os'], 'features': {'dynamic_refresh': 1}, 'example_value': True, } diff --git a/tools/grit/grit/format/policy_templates/writer_configuration.py b/tools/grit/grit/format/policy_templates/writer_configuration.py index 7280b7d..11bcf54 100644 --- a/tools/grit/grit/format/policy_templates/writer_configuration.py +++ b/tools/grit/grit/format/policy_templates/writer_configuration.py @@ -24,6 +24,7 @@ def GetConfigurationForBuild(defines): 'build': 'chromium', 'app_name': 'Chromium', 'frame_name': 'Chromium Frame', + 'os_name': 'Chromium OS', 'win_reg_key_name': 'Software\\Policies\\Chromium', 'win_category_path': ['chromium'], 'admx_namespace': 'Chromium.Policies.Chromium', @@ -34,6 +35,7 @@ def GetConfigurationForBuild(defines): 'build': 'chrome', 'app_name': 'Google Chrome', 'frame_name': 'Google Chrome Frame', + 'os_name': 'Google Chrome OS', 'win_reg_key_name': 'Software\\Policies\\Google\\Chrome', 'win_category_path': ['google', 'googlechrome'], 'admx_namespace': 'Google.Policies.Chrome', diff --git a/tools/grit/grit/format/policy_templates/writers/doc_writer.py b/tools/grit/grit/format/policy_templates/writers/doc_writer.py index 19feb1a..279f374 100644 --- a/tools/grit/grit/format/policy_templates/writers/doc_writer.py +++ b/tools/grit/grit/format/policy_templates/writers/doc_writer.py @@ -454,11 +454,13 @@ class DocWriter(xml_formatted_writer.XMLFormattedWriter): 'win': 'Windows', 'mac': 'Mac', 'linux': 'Linux', + 'chrome_os': self.config['os_name'], } # Human-readable names of supported products. self._PRODUCT_MAP = { 'chrome': self.config['app_name'], 'chrome_frame': self.config['frame_name'], + 'chrome_os': self.config['os_name'], } # Human-readable names of supported features. self._FEATURE_MAP = { diff --git a/tools/grit/grit/format/policy_templates/writers/doc_writer_unittest.py b/tools/grit/grit/format/policy_templates/writers/doc_writer_unittest.py index 85f1bb8..15ccc68 100644 --- a/tools/grit/grit/format/policy_templates/writers/doc_writer_unittest.py +++ b/tools/grit/grit/format/policy_templates/writers/doc_writer_unittest.py @@ -63,6 +63,7 @@ class DocWriterUnittest(writer_unittest_common.WriterUnittestCommon): config={ 'app_name': 'Chrome', 'frame_name': 'Chrome Frame', + 'os_name': 'Chrome OS', 'win_reg_key_name': 'MockKey', }, messages=MockMessageDictionary()) |