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

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

Issue 14927015: Translate device-local account IDs to user IDs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix forward declaration. Created 7 years, 7 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/device_local_account_policy_provider.cc
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
index a269ef3cd73e21de4f83d86ce8d0114ce5d1bc61..6b0535e00d5c2b5a233c0b12aefabff106269047 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
@@ -12,9 +12,9 @@
namespace policy {
DeviceLocalAccountPolicyProvider::DeviceLocalAccountPolicyProvider(
- const std::string& account_id,
+ const std::string& user_id,
DeviceLocalAccountPolicyService* service)
- : account_id_(account_id),
+ : user_id_(user_id),
service_(service),
store_initialized_(false),
waiting_for_policy_refresh_(false),
@@ -47,8 +47,8 @@ void DeviceLocalAccountPolicyProvider::RefreshPolicies() {
}
void DeviceLocalAccountPolicyProvider::OnPolicyUpdated(
- const std::string& account_id) {
- if (account_id == account_id_)
+ const std::string& user_id) {
+ if (user_id == user_id_)
UpdateFromBroker();
}
@@ -57,7 +57,7 @@ void DeviceLocalAccountPolicyProvider::OnDeviceLocalAccountsChanged() {
}
DeviceLocalAccountPolicyBroker* DeviceLocalAccountPolicyProvider::GetBroker() {
- return service_->GetBrokerForAccount(account_id_);
+ return service_->GetBrokerForUser(user_id_);
}
void DeviceLocalAccountPolicyProvider::ReportPolicyRefresh(bool success) {

Powered by Google App Engine
This is Rietveld 408576698