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

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

Issue 23532034: Postpone loading about:flags ui until the certificates have been loaded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 3 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/login/parallel_authenticator.cc
diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc
index 234cc271c5441307a201690933915e7ba084e231..9d0a5d22ce2a7199e42aabd790a485e13eb2b81e 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator.cc
@@ -524,10 +524,11 @@ bool ParallelAuthenticator::VerifyOwner() {
}
void ParallelAuthenticator::OnOwnershipChecked(
- DeviceSettingsService::OwnershipStatus status,
- bool is_owner) {
+ DeviceSettingsService::OwnershipStatus status) {
// Now we can check if this user is the owner.
- user_can_login_ = is_owner;
+ // TODO(tbarzic): This is broken. At this point, DeviceSettingsService will
+ // never have private key loaded (http://crbug.com/285450).
+ user_can_login_ = DeviceSettingsService::Get()->HasPrivateOwnerKey();
owner_is_verified_ = true;
Resolve();
}
« no previous file with comments | « chrome/browser/chromeos/login/parallel_authenticator.h ('k') | chrome/browser/chromeos/login/user_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698