Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7362)

Unified Diff: chrome/browser/policy/browser_policy_connector.cc

Issue 10545033: Removed the PolicyDefinitionList from the ConfigurationPolicyProvider interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index e396545ab5658d18419871b0c15b3945ff0069fe..322bd83432bf1ec48afb920de983a1c4c7dddf09 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -137,11 +137,9 @@ void BrowserPolicyConnector::Init() {
if (!command_line->HasSwitch(switches::kEnableCloudPolicyService)) {
managed_cloud_provider_.reset(new CloudPolicyProvider(
this,
- GetChromePolicyDefinitionList(),
POLICY_LEVEL_MANDATORY));
recommended_cloud_provider_.reset(new CloudPolicyProvider(
this,
- GetChromePolicyDefinitionList(),
POLICY_LEVEL_RECOMMENDED));
}
}
@@ -553,22 +551,22 @@ void BrowserPolicyConnector::CompleteInitialization() {
}
// static
-ConfigurationPolicyProvider*
- BrowserPolicyConnector::CreatePlatformProvider() {
- const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
+ConfigurationPolicyProvider* BrowserPolicyConnector::CreatePlatformProvider() {
#if defined(OS_WIN)
+ const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
scoped_ptr<AsyncPolicyLoader> loader(new PolicyLoaderWin(policy_list));
- return new AsyncPolicyProvider(policy_list, loader.Pass());
+ return new AsyncPolicyProvider(loader.Pass());
#elif defined(OS_MACOSX)
+ const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
scoped_ptr<AsyncPolicyLoader> loader(
new PolicyLoaderMac(policy_list, new MacPreferences()));
- return new AsyncPolicyProvider(policy_list, loader.Pass());
+ return new AsyncPolicyProvider(loader.Pass());
#elif defined(OS_POSIX)
FilePath config_dir_path;
if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
scoped_ptr<AsyncPolicyLoader> loader(
new ConfigDirPolicyLoader(config_dir_path, POLICY_SCOPE_MACHINE));
- return new AsyncPolicyProvider(policy_list, loader.Pass());
+ return new AsyncPolicyProvider(loader.Pass());
} else {
return NULL;
}
« no previous file with comments | « chrome/browser/policy/async_policy_provider_unittest.cc ('k') | chrome/browser/policy/cloud_policy_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698