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

Unified Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc

Issue 1266563002: Added affiliation IDs for the new affiliation determination. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/chromeos/policy/user_cloud_policy_manager_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
index ff817c71a819052790cd7a62732041dbaa7c876c..466fd019e5ce527328a5f41c4d537234756900cc 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
+#include <set>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/logging.h"
@@ -14,6 +16,8 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/session/user_session_manager.h"
+#include "chrome/browser/chromeos/login/users/affiliation.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
#include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h"
#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
#include "chrome/browser/chromeos/policy/wildcard_login_checker.h"
@@ -274,6 +278,22 @@ void UserCloudPolicyManagerChromeOS::OnComponentCloudPolicyUpdated() {
StartRefreshSchedulerIfReady();
}
+void UserCloudPolicyManagerChromeOS::OnStoreLoaded(
+ CloudPolicyStore* cloud_policy_store) {
+ CloudPolicyManager::OnStoreLoaded(cloud_policy_store);
+
+ em::PolicyData const* const policy_data = cloud_policy_store->policy();
+
+ if (policy_data) {
+ chromeos::AffiliationIDSet set_of_user_affiliation_ids(
+ policy_data->user_affiliation_ids().begin(),
+ policy_data->user_affiliation_ids().end());
+
+ chromeos::ChromeUserManager::Get()->SetUserAffiliation(
+ policy_data->username(), set_of_user_affiliation_ids);
+ }
+}
+
void UserCloudPolicyManagerChromeOS::GetChromePolicy(PolicyMap* policy_map) {
CloudPolicyManager::GetChromePolicy(policy_map);
« no previous file with comments | « chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h ('k') | chrome/browser/policy/test/policy_testserver.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698