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 /build | |
| 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 'build')
| -rw-r--r-- | build/ios/grit_whitelist.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index 4fd126c..a7dac60 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -866,7 +866,6 @@ IDS_POLICY_FILTER_PLACEHOLDER IDS_POLICY_HEADER_LEVEL IDS_POLICY_HEADER_NAME IDS_POLICY_HEADER_SCOPE -IDS_POLICY_HEADER_SOURCE IDS_POLICY_HEADER_STATUS IDS_POLICY_HEADER_VALUE IDS_POLICY_HIDE_EXPANDED_VALUE @@ -906,10 +905,6 @@ IDS_POLICY_SCOPE_DEVICE IDS_POLICY_SCOPE_USER IDS_POLICY_SHOW_EXPANDED_VALUE IDS_POLICY_SHOW_UNSET -IDS_POLICY_SOURCE_CLOUD -IDS_POLICY_SOURCE_ENTERPRISE_DEFAULT -IDS_POLICY_SOURCE_ENTERPRISE_OVERRIDE -IDS_POLICY_SOURCE_PLATFORM IDS_POLICY_STATUS IDS_POLICY_STATUS_DEVICE IDS_POLICY_STATUS_USER |