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

Unified Diff: chrome/browser/policy/user_cloud_policy_manager.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/user_cloud_policy_manager.cc
diff --git a/chrome/browser/policy/user_cloud_policy_manager.cc b/chrome/browser/policy/user_cloud_policy_manager.cc
index 693f0362e697c87439a9d86e15c51a12df673799..ccbc55dda31fbab82898fc60c9342ed7d4902193 100644
--- a/chrome/browser/policy/user_cloud_policy_manager.cc
+++ b/chrome/browser/policy/user_cloud_policy_manager.cc
@@ -16,7 +16,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
-#include "policy/policy_constants.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/policy/user_cloud_policy_store_chromeos.h"
@@ -43,11 +42,9 @@ const FilePath::CharType kPolicyCacheFile[] = FILE_PATH_LITERAL("Policy");
} // namespace
UserCloudPolicyManager::UserCloudPolicyManager(
- const PolicyDefinitionList* policy_list,
scoped_ptr<CloudPolicyStore> store,
bool wait_for_policy_fetch)
- : ConfigurationPolicyProvider(policy_list),
- wait_for_policy_fetch_(wait_for_policy_fetch),
+ : wait_for_policy_fetch_(wait_for_policy_fetch),
wait_for_policy_refresh_(false),
store_(store.Pass()) {
store_->Load();
@@ -78,8 +75,7 @@ scoped_ptr<UserCloudPolicyManager> UserCloudPolicyManager::Create(
chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
token_cache_file, policy_cache_file));
return scoped_ptr<UserCloudPolicyManager>(
- new UserCloudPolicyManager(GetChromePolicyDefinitionList(),
- store.Pass(), wait_for_policy_fetch));
+ new UserCloudPolicyManager(store.Pass(), wait_for_policy_fetch));
}
#endif
« no previous file with comments | « chrome/browser/policy/user_cloud_policy_manager.h ('k') | chrome/browser/policy/user_cloud_policy_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698