Roll grit to r9, added new template input.

BUG=49941
TEST=Generation of policy_templates still works


Review URL: http://codereview.chromium.org/8819015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113204 0039d316-1c4b-4281-b951-d872f2087c98
parent a82d896d
...@@ -100,7 +100,7 @@ deps = { ...@@ -100,7 +100,7 @@ deps = {
(Var("googlecode_url") % "snappy") + "/trunk@37", (Var("googlecode_url") % "snappy") + "/trunk@37",
"src/tools/grit": "src/tools/grit":
(Var("googlecode_url") % "grit-i18n") + "/trunk@8", (Var("googlecode_url") % "grit-i18n") + "/trunk@9",
"src/tools/gyp": "src/tools/gyp":
(Var("googlecode_url") % "gyp") + "/trunk@1101", (Var("googlecode_url") % "gyp") + "/trunk@1101",
......
...@@ -2225,10 +2225,18 @@ ...@@ -2225,10 +2225,18 @@
'desc': '''The name of the feature that indicates for a given policy that changes to it are respected by Chrome without a browser restart''', 'desc': '''The name of the feature that indicates for a given policy that changes to it are respected by Chrome without a browser restart''',
'text': '''Dynamic Policy Refresh''' 'text': '''Dynamic Policy Refresh'''
}, },
'doc_feature_can_be_recommended': {
'desc': '''The name of the feature that indicates for a given policy that it can be recommended, instead of mandatory''',
'text': '''Can Be Recommended'''
},
'doc_deprecated': { 'doc_deprecated': {
'desc': '''Text appended in parentheses to the policy name to indicate t hat it has been deprecated''', 'desc': '''Text appended in parentheses to the policy name to indicate that it has been deprecated''',
'text': 'deprecated', 'text': 'deprecated',
} },
'doc_recommended': {
'desc': '''Text appended in parentheses next to the policies top-level container to indicate that those policies are of the Recommended level''',
'text': 'Recommended',
},
}, },
'placeholders': [], 'placeholders': [],
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment