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

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

Issue 2486813002: Add DeviceADPolicyManager to provide AD policy. (Closed)
Patch Set: Address Bernhard's comments Created 4 years, 1 month 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/profile_policy_connector.cc
diff --git a/chrome/browser/policy/profile_policy_connector.cc b/chrome/browser/policy/profile_policy_connector.cc
index f46e517e50890d464b0a48fb8a373afc0f5643bb..9b05203d076e7dc9523c97f25efed2658c486e4a 100644
--- a/chrome/browser/policy/profile_policy_connector.cc
+++ b/chrome/browser/policy/profile_policy_connector.cc
@@ -26,6 +26,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
+#include "chrome/browser/chromeos/policy/device_active_directory_policy_manager.h"
#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
#include "chrome/browser/chromeos/policy/device_local_account.h"
#include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
@@ -90,8 +91,13 @@ void ProfilePolicyConnector::Init(
}
#if defined(OS_CHROMEOS)
- if (connector->GetDeviceCloudPolicyManager())
+ if (connector->GetDeviceCloudPolicyManager()) {
policy_providers_.push_back(connector->GetDeviceCloudPolicyManager());
+ }
+ if (connector->GetDeviceActiveDirectoryPolicyManager()) {
+ policy_providers_.push_back(
+ connector->GetDeviceActiveDirectoryPolicyManager());
+ }
#endif
if (user_cloud_policy_manager)

Powered by Google App Engine
This is Rietveld 408576698