diff options
| author | dgrogan <dgrogan@chromium.org> | 2015-09-18 14:30:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 21:30:56 +0000 |
| commit | c8778b84c83b210d60046b538e9d16cfc1f534cd (patch) | |
| tree | 154dde58b86a981aa551968bbd8786401ec1dc72 /tools/gritsettings | |
| parent | 60dcd47179f859b54ef549bd9074289a3c3e59be (diff) | |
| download | chromium_src-c8778b84c83b210d60046b538e9d16cfc1f534cd.zip chromium_src-c8778b84c83b210d60046b538e9d16cfc1f534cd.tar.gz chromium_src-c8778b84c83b210d60046b538e9d16cfc1f534cd.tar.bz2 | |
Revert of Add source column to chrome://policy showing the origins of policies. (patchset #18 id:620001 of https://codereview.chromium.org/1304843004/ )
Reason for revert:
Fix google chrome compile. http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux%20x64/builds/4220/steps/compile/logs/stdio
../../chrome/browser/ui/startup/startup_browser_creator_browsertest.cc:1235:23:error:
too few arguments to function call, expected 6, have 5
NULL);
^
../../components/policy/core/common/policy_map.h:66:3: note: 'Set' declared here
void Set(const std::string& policy,
^
Original issue's description:
> 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
>
> Committed: https://crrev.com/92e7960f06c2ac2ec0113bb88df3d322f0eb97fe
> Cr-Commit-Position: refs/heads/master@{#349654}
>
> Committed: https://crrev.com/2c4ce2a1988fdde3456e49112eba6c7855ca4528
> Cr-Commit-Position: refs/heads/master@{#349749}
TBR=tnagel@chromium.org,bartfab@chromium.org,dbeam@chromium.org,jam@chromium.org,fhorschig@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=506123
Review URL: https://codereview.chromium.org/1350913006
Cr-Commit-Position: refs/heads/master@{#349774}
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 df2e6ca..e3e1dd6 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": [30160], + "messages": [30140], }, "components/components_google_chrome_strings.grd": { - "messages": [30160], + "messages": [30140], }, "components/resources/components_resources.grd": { - "includes": [30175], + "includes": [30155], }, "components/resources/components_scaled_resources.grd": { - "structures": [30350], + "structures": [30310], }, "third_party/WebKit/public/blink_resources.grd": { - "includes": [30370], - "structures": [30670], + "includes": [30350], + "structures": [30650], }, "chrome/browser/devtools/device/webrtc/resources.grd": { - "includes": [30820], + "includes": [30800], }, "chrome/browser/resources/settings/settings_resources.grd": { - "structures": [30920], + "structures": [30900], }, # Resource ids starting at 31000 are reserved for projects built on Chromium. |