diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 13:49:20 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 13:49:20 +0000 |
| commit | 991573eea1ab5aeefb920ef46a055271713d694a (patch) | |
| tree | 2383d405f522d0441452d3befe9160e968a5f35e /tools | |
| parent | 7f123d2a3dc472dd796c13e2d7d599446fe9831d (diff) | |
| download | chromium_src-991573eea1ab5aeefb920ef46a055271713d694a.zip chromium_src-991573eea1ab5aeefb920ef46a055271713d694a.tar.gz chromium_src-991573eea1ab5aeefb920ef46a055271713d694a.tar.bz2 | |
Move chrome/app/policy into components/policy.
This move enables using the files derived from policy_templates.json in iOS
builds. List of changes:
- cloud_policy_codegen.gyp and policy_templates.gypi have been merged into
components/policy.gypi
- policy_templates.json moved into components/policy/resources/
- policy_templates.grd and *.xtb files moved into components/policy/resources/
- syntax_check_policy_templates_json.py and
chrome/tools/build/generate_policy_source.py moved into
components/policy/tools
BUG=271392
R=jochen@chromium.org, pastarmovj@chromium.org
Review URL: https://codereview.chromium.org/108513011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gritsettings/resource_ids | 2 | ||||
| -rw-r--r-- | tools/metrics/histograms/histograms.xml | 3 | ||||
| -rw-r--r-- | tools/metrics/histograms/update_policies.py | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index f520ed9..80ba1d0 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -125,7 +125,7 @@ "structures": [19500], }, - "chrome/app/policy/policy_templates.grd": { + "components/policy/resources/policy_templates.grd": { "structures": [20500], "messages": [20510], }, diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index b0cec02..d81bc01 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml @@ -23076,7 +23076,8 @@ other types of suffix sets. </enum> <enum name="EnterprisePolicies" type="int"> -<!-- Generated from ../../../chrome/app/policy/policy_templates.json --> +<!-- Generated from + ../../../components/policy/resources/policy_templates.json --> <int value="1" label="Configure the home page URL"/> <int value="2" label="Use New Tab Page as homepage"/> diff --git a/tools/metrics/histograms/update_policies.py b/tools/metrics/histograms/update_policies.py index dd0447f..5cad317 100644 --- a/tools/metrics/histograms/update_policies.py +++ b/tools/metrics/histograms/update_policies.py @@ -19,7 +19,8 @@ from diffutil import PromptUserToAcceptDiff from pretty_print import PrettyPrintNode HISTOGRAMS_PATH = 'histograms.xml' -POLICY_TEMPLATES_PATH = '../../../chrome/app/policy/policy_templates.json' +POLICY_TEMPLATES_PATH = + '../../../components/policy/resources/policy_templates.json' ENUM_NAME = 'EnterprisePolicies' class UserError(Exception): |