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

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 1306183007: Switch to id-based affiliation determination (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 3e331d5d8d0ca216f1269f907649fb33d187b24a..83fe26b7f78a4ece728ab1205f510cdec74b3572 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -128,7 +128,6 @@
#include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
#include "chrome/browser/chromeos/net/client_cert_filter_chromeos.h"
#include "chrome/browser/chromeos/net/client_cert_store_chromeos.h"
-#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/policy/policy_cert_service.h"
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
#include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
@@ -449,14 +448,9 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
user->username_hash(),
profile->GetPath()));
- // Use the device-wide system key slot only if the user is of the same
- // domain as the device is registered to.
- policy::BrowserPolicyConnectorChromeOS* connector =
- g_browser_process->platform_part()
- ->browser_policy_connector_chromeos();
- params->use_system_key_slot =
- connector->GetUserAffiliation(user->email()) ==
- policy::USER_AFFILIATION_MANAGED;
+ // Use the device-wide system key slot only if the user is affiliated on
+ // the device.
+ params->use_system_key_slot = user->is_affiliated();
}
}

Powered by Google App Engine
This is Rietveld 408576698