diff options
| author | fhorschig <fhorschig@chromium.org> | 2015-09-18 05:40:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 12:40:42 +0000 |
| commit | 92e7960f06c2ac2ec0113bb88df3d322f0eb97fe (patch) | |
| tree | 0fa68505217465b00db7d9bb66074bd44c00fe4e /tools/gritsettings | |
| parent | fffab7c9a274eaf70a12602c2dd3ba81caf318ed (diff) | |
| download | chromium_src-92e7960f06c2ac2ec0113bb88df3d322f0eb97fe.zip chromium_src-92e7960f06c2ac2ec0113bb88df3d322f0eb97fe.tar.gz chromium_src-92e7960f06c2ac2ec0113bb88df3d322f0eb97fe.tar.bz2 | |
Add source column to chrome://policy showing the origins of policies.
These are the possible sources for a policy:
Cloud - Policy values received from the cloud.
Platform - Local configured policies.
Enterprise Default - Defaults for policies in enterprise environments
on Chrome OS. Can be overridden.
Enterprise Override - Policies enforced in enterprise environments on
Chrome OS. Can NOT be overridden.
The source of a policy is determined when it's first set. For cloud
policies, this would be the decoding of the protocol buffers.
Platform policies are usually set by loading platform-specific local
configurations like entries in the Windows registry.
Enterprise defaults are automatically set if the device is active in
an enterprise environment.
Enterprise override policies are set within the code to enforce
specific behaviors (like ash tray visibility). They cannot be
overridden.
BUG=506123
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1304843004
Cr-Commit-Position: refs/heads/master@{#349654}
Diffstat (limited to 'tools/gritsettings')
| -rw-r--r-- | tools/gritsettings/resource_ids | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index e3e1dd6..df2e6ca 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -262,26 +262,26 @@ # We only use one file depending on whether we're building Chromium or # Google Chrome. "components/components_chromium_strings.grd": { - "messages": [30140], + "messages": [30160], }, "components/components_google_chrome_strings.grd": { - "messages": [30140], + "messages": [30160], }, "components/resources/components_resources.grd": { - "includes": [30155], + "includes": [30175], }, "components/resources/components_scaled_resources.grd": { - "structures": [30310], + "structures": [30350], }, "third_party/WebKit/public/blink_resources.grd": { - "includes": [30350], - "structures": [30650], + "includes": [30370], + "structures": [30670], }, "chrome/browser/devtools/device/webrtc/resources.grd": { - "includes": [30800], + "includes": [30820], }, "chrome/browser/resources/settings/settings_resources.grd": { - "structures": [30900], + "structures": [30920], }, # Resource ids starting at 31000 are reserved for projects built on Chromium. |