diff options
| author | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 15:44:37 +0000 |
|---|---|---|
| committer | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 15:44:37 +0000 |
| commit | fcf53571062bd52559112684f18989965bda607d (patch) | |
| tree | e64c7a1e1c1b303ad03513b6716f7ee2d5680440 /chrome/browser/prefs/pref_service.cc | |
| parent | 03c7f66c2cd69c42078e807c3835c5b510fed253 (diff) | |
| download | chromium_src-fcf53571062bd52559112684f18989965bda607d.zip chromium_src-fcf53571062bd52559112684f18989965bda607d.tar.gz chromium_src-fcf53571062bd52559112684f18989965bda607d.tar.bz2 | |
Move user cloud policy to BrowserProcess (was 6979011)
This CL basically does the following things:
* Remove final dependencies of ProfilePolicyConnector on Profile
* Take ProfilePolicyConnector away from Profile and put it into BrowserPolicyConnector.
* Make BrowserPolicyConnector instance persistant and allow to
exchange the CloudPolicySubsystem backend instead.
* Introduce a new CloudPolicyProvider which combines two
(or more) CloudPolicyCacheBase backends and applies their policies in a well defined order.
That is the order in which the CloudPolicyCacheBases appear in
the List of CloudPolicyProvider determines the precedence,
early Providers get applied first and block the applied policies
for later Caches.
* Handles ProxyPolicies in CloudPolicyProvider making
the old infrastructure around MergingPolicyConnector obsolete.
* Consequently this means that user cloud policy can now serve local_state.
Continuation of http://codereview.chromium.org/6979011/
Patch from sfeuz@chromium.org with additional work from gfeher@chromium.org
BUG=none
TEST=Unittests CloudPolicyProvider.*
Review URL: http://codereview.chromium.org/7147015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_service.cc')
| -rw-r--r-- | chrome/browser/prefs/pref_service.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc index c18d89c..716e584 100644 --- a/chrome/browser/prefs/pref_service.cc +++ b/chrome/browser/prefs/pref_service.cc @@ -112,7 +112,6 @@ class ReadErrorHandler : public PersistentPrefStore::ReadErrorDelegate { // static PrefService* PrefService::CreatePrefService(const FilePath& pref_filename, PrefStore* extension_prefs, - Profile* profile, bool async) { using policy::ConfigurationPolicyPrefStore; @@ -132,7 +131,7 @@ PrefService* PrefService::CreatePrefService(const FilePath& pref_filename, ConfigurationPolicyPrefStore* managed_platform = ConfigurationPolicyPrefStore::CreateManagedPlatformPolicyPrefStore(); ConfigurationPolicyPrefStore* managed_cloud = - ConfigurationPolicyPrefStore::CreateManagedCloudPolicyPrefStore(profile); + ConfigurationPolicyPrefStore::CreateManagedCloudPolicyPrefStore(); CommandLinePrefStore* command_line = new CommandLinePrefStore(CommandLine::ForCurrentProcess()); JsonPrefStore* user = new JsonPrefStore( @@ -141,8 +140,7 @@ PrefService* PrefService::CreatePrefService(const FilePath& pref_filename, ConfigurationPolicyPrefStore* recommended_platform = ConfigurationPolicyPrefStore::CreateRecommendedPlatformPolicyPrefStore(); ConfigurationPolicyPrefStore* recommended_cloud = - ConfigurationPolicyPrefStore::CreateRecommendedCloudPolicyPrefStore( - profile); + ConfigurationPolicyPrefStore::CreateRecommendedCloudPolicyPrefStore(); DefaultPrefStore* default_pref_store = new DefaultPrefStore(); return new PrefService( |