Commit 69abcb21 authored by joaodasilva's avatar joaodasilva Committed by Commit bot

Roll grit to 175.

This fixes an issue with invalid JSON being generated as example values
for policies on Windows, and points to the documentation for complex
policies on Windows.

BUG=381627

Review URL: https://codereview.chromium.org/511993003

Cr-Commit-Position: refs/heads/master@{#292425}
parent af46dd18
...@@ -154,7 +154,7 @@ deps = { ...@@ -154,7 +154,7 @@ deps = {
Var('chromium_git') + '/external/snappy.git' + '@' + '762bb32f0c9d2f31ba4958c7c0933d22e80c20bf', Var('chromium_git') + '/external/snappy.git' + '@' + '762bb32f0c9d2f31ba4958c7c0933d22e80c20bf',
'src/tools/grit': 'src/tools/grit':
Var('chromium_git') + '/external/grit-i18n.git' + '@' + '206c6aa4450db4e961d20f8367f33df42bba6a85', # from svn revision 173 Var('chromium_git') + '/external/grit-i18n.git' + '@' + '77abf65c1d72af6fb7f9ef6f50cdf29fcf42d0a1', # from svn revision 175
'src/tools/gyp': 'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + '43a3b907eb20bd59c28c6e315b3d9e348ab57ac7', # from svn revision 1970 Var('chromium_git') + '/external/gyp.git' + '@' + '43a3b907eb20bd59c28c6e315b3d9e348ab57ac7', # from svn revision 1970
......
...@@ -6777,6 +6777,10 @@ ...@@ -6777,6 +6777,10 @@
'desc': '''Text appended in parentheses next to the policies top-level container to indicate that those policies are of the Recommended level''', 'desc': '''Text appended in parentheses next to the policies top-level container to indicate that those policies are of the Recommended level''',
'text': 'Default Settings (users can override)', 'text': 'Default Settings (users can override)',
}, },
'doc_complex_policies_on_windows': {
'desc': '''Text pointing the user to a help article for complex policies on Windows''',
'text': '''encoded as a JSON string, for details see <ph name="COMPLEX_POLICIES_URL">http://www.chromium.org/administrators/complex-policies-on-windows<ex>http://www.chromium.org/administrators/complex-policies-on-windows</ex></ph>''',
},
}, },
'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