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

Unified Diff: chrome/browser/chromeos/login/user_manager_impl.cc

Issue 271063002: Reintroduce proper checking for owner profile for the UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/settings/device_settings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
index 7f27162939a9bfc15504455f5649e9d745ee8804..de8892a9eef41e5f1206c814683854a6177cdf30 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -926,14 +926,8 @@ void UserManagerImpl::Observe(int type,
if (device_local_account_policy_service_)
device_local_account_policy_service_->AddObserver(this);
}
- // Making this call synchronously is not gonna cut it because
- // notification order is not defined and in a single message loop run and
- // getting trusted settings rely on a reload that happens on the very same
- // notification observation.
- base::MessageLoop::current()->PostTask(FROM_HERE,
- base::Bind(&UserManagerImpl::RetrieveTrustedDevicePolicies,
- base::Unretained(this)));
- UserManagerImpl::UpdateOwnership();
+ RetrieveTrustedDevicePolicies();
+ UpdateOwnership();
break;
case chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED: {
Profile* profile = content::Details<Profile>(details).ptr();
@@ -1293,8 +1287,8 @@ void UserManagerImpl::RetrieveTrustedDevicePolicies() {
// Schedule a callback if device policy has not yet been verified.
if (CrosSettingsProvider::TRUSTED != cros_settings_->PrepareTrustedValues(
- base::Bind(&UserManagerImpl::RetrieveTrustedDevicePolicies,
- base::Unretained(this)))) {
+ base::Bind(&UserManagerImpl::RetrieveTrustedDevicePolicies,
+ base::Unretained(this)))) {
return;
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/settings/device_settings_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698