diff options
| author | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 11:47:41 +0000 |
|---|---|---|
| committer | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 11:47:41 +0000 |
| commit | dce80b18188d233d56aa9a94a3b6feb63ec418ba (patch) | |
| tree | a29e7242ea164d32c75f8ee24076bfd7c70f8e09 /tools/grit | |
| parent | 514976169e1422f75b0d7db44995917986ae2c0d (diff) | |
| download | chromium_src-dce80b18188d233d56aa9a94a3b6feb63ec418ba.zip chromium_src-dce80b18188d233d56aa9a94a3b6feb63ec418ba.tar.gz chromium_src-dce80b18188d233d56aa9a94a3b6feb63ec418ba.tar.bz2 | |
Add ChromeOS to the list of valid platform names in the policy metafile
BUG=58498
TEST=none
Review URL: http://codereview.chromium.org/4175001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/grit')
3 files changed, 5 insertions, 0 deletions
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()) |