diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 15:08:33 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 15:08:33 +0000 |
| commit | b6e695a9c6fa185592c01bd16fcbd7b95296e571 (patch) | |
| tree | 10349ec3142cca9f7dcb01f6d519c7964a90d899 /chrome/browser/policy/user_policy_cache.cc | |
| parent | 8373335453c1100bcaa43f070b30a00217bd3216 (diff) | |
| download | chromium_src-b6e695a9c6fa185592c01bd16fcbd7b95296e571.zip chromium_src-b6e695a9c6fa185592c01bd16fcbd7b95296e571.tar.gz chromium_src-b6e695a9c6fa185592c01bd16fcbd7b95296e571.tar.bz2 | |
Move observers to ConfigurationPolicyProvider.
Share more code for ConfigurationPolicyProviders at the base class.
Removed the DummyConfigurationPolicyProvider.
Removed the DummyCloudPolicyProvider.
Moved ApplyPolicyValueTree to PolicyMap.
BUG=chromium-os:17309
TEST=Everything works as before
Review URL: http://codereview.chromium.org/8059029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy/user_policy_cache.cc')
| -rw-r--r-- | chrome/browser/policy/user_policy_cache.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/policy/user_policy_cache.cc b/chrome/browser/policy/user_policy_cache.cc index 03f583b..b0d92cf 100644 --- a/chrome/browser/policy/user_policy_cache.cc +++ b/chrome/browser/policy/user_policy_cache.cc @@ -11,9 +11,7 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "chrome/browser/browser_process.h" -#include "chrome/browser/policy/browser_policy_connector.h" -#include "chrome/browser/policy/cloud_policy_provider.h" +#include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/enterprise_metrics.h" #include "chrome/browser/policy/policy_map.h" #include "chrome/browser/policy/proto/cloud_policy.pb.h" @@ -141,10 +139,9 @@ void UserPolicyCache::MaybeDecodeOldstylePolicy( result.Set(named_value->name(), decoded_value); } } - // Hack: Let one of the providers do the transformation from DictionaryValue - // to PolicyMap, since they have the required code anyway. - g_browser_process->browser_policy_connector()->GetManagedCloudProvider()-> - ApplyPolicyValueTree(&result, mandatory); + mandatory->LoadFrom( + &result, + ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList()); } Value* UserPolicyCache::DecodeIntegerValue( |