From d2177996db8711c972258e43d70ed90252170441 Mon Sep 17 00:00:00 2001 From: "tommi@chromium.org" Date: Fri, 10 Sep 2010 04:59:33 +0000 Subject: Add policy support for Chrome Frame. New Chrome Frame messages added to th json and grd files that are used to generate the policy templates. Added matching constants for the policy elements to the policy_constants files. Added support for a new template value, $3, that represents the Chrome Frame product name in policy templates. TEST=none BUG=29349 Review URL: http://codereview.chromium.org/3325011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59050 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/grit/grit/format/policy_templates/template_formatter.py | 1 + tools/grit/grit/format/policy_templates/writer_configuration.py | 2 ++ 2 files changed, 3 insertions(+) (limited to 'tools/grit') diff --git a/tools/grit/grit/format/policy_templates/template_formatter.py b/tools/grit/grit/format/policy_templates/template_formatter.py index 354a5f8..8e03aac 100644 --- a/tools/grit/grit/format/policy_templates/template_formatter.py +++ b/tools/grit/grit/format/policy_templates/template_formatter.py @@ -93,6 +93,7 @@ class TemplateFormatter(interface.ItemFormatter): msg_txt = message.Translate(self._lang) # Replace the placeholder of app name. msg_txt = msg_txt.replace('$1', self._config['app_name']) + msg_txt = msg_txt.replace('$3', self._config['frame_name']) # Replace other placeholders. for placeholder in self._policy_data['placeholders']: msg_txt = msg_txt.replace(placeholder['key'], placeholder['value']) diff --git a/tools/grit/grit/format/policy_templates/writer_configuration.py b/tools/grit/grit/format/policy_templates/writer_configuration.py index fc1a821..7280b7d 100644 --- a/tools/grit/grit/format/policy_templates/writer_configuration.py +++ b/tools/grit/grit/format/policy_templates/writer_configuration.py @@ -23,6 +23,7 @@ def GetConfigurationForBuild(defines): config = { 'build': 'chromium', 'app_name': 'Chromium', + 'frame_name': 'Chromium Frame', 'win_reg_key_name': 'Software\\Policies\\Chromium', 'win_category_path': ['chromium'], 'admx_namespace': 'Chromium.Policies.Chromium', @@ -32,6 +33,7 @@ def GetConfigurationForBuild(defines): config = { 'build': 'chrome', 'app_name': 'Google Chrome', + 'frame_name': 'Google Chrome Frame', 'win_reg_key_name': 'Software\\Policies\\Google\\Chrome', 'win_category_path': ['google', 'googlechrome'], 'admx_namespace': 'Google.Policies.Chrome', -- cgit v1.1