diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-30 13:50:04 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-30 13:50:04 +0000 |
| commit | 6a28e0af2a2624e0ebddde8cd3c89d33d58e7479 (patch) | |
| tree | 7d60e756e356c0ecb049447251b46cdb81f0ddfc /components/policy.gypi | |
| parent | 61418efa678b45ebdbf057b0bc6cae8a0ca796fc (diff) | |
| download | chromium_src-6a28e0af2a2624e0ebddde8cd3c89d33d58e7479.zip chromium_src-6a28e0af2a2624e0ebddde8cd3c89d33d58e7479.tar.gz chromium_src-6a28e0af2a2624e0ebddde8cd3c89d33d58e7479.tar.bz2 | |
Move the PolicyDomain and PolicyNamespace types to the policy component.
Also refactored the files that use these types, so that they don't need to
include the policy_service.h anymore. In some cases this was a circular
dependency (e.g. PolicyBundle).
BUG=271392
Review URL: https://codereview.chromium.org/50613003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/policy.gypi')
| -rw-r--r-- | components/policy.gypi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components/policy.gypi b/components/policy.gypi index 77fe110..32aed7e 100644 --- a/components/policy.gypi +++ b/components/policy.gypi @@ -20,6 +20,8 @@ 'conditions': [ ['configuration_policy==1', { 'sources': [ + 'policy/core/common/policy_namespace.cc', + 'policy/core/common/policy_namespace.h', 'policy/core/common/policy_pref_names.cc', 'policy/core/common/policy_pref_names.h', 'policy/core/common/policy_switches.cc', @@ -30,14 +32,12 @@ 'policy/policy_export.h', ], }, { # configuration_policy==0 - # The target 'policy_component' always exists. Later it will include - # some stubs when configuration_policy==0. For now this stub file is - # compiled so that an output is produced, otherwise the shared build - # breaks on iOS. - # TODO(joaodasilva): remove this comment and the temporary stub after - # moving one of the real stubs. http://crbug.com/271392 + # Some of the policy code is always enabled, so that other parts of + # Chrome can always interface with the PolicyService without having + # to #ifdef on ENABLE_CONFIGURATION_POLICY. 'sources': [ - 'policy/stub_to_remove.cc', + 'policy/core/common/policy_namespace.cc', + 'policy/core/common/policy_namespace.h', ], }], ], |