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

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

Issue 10918027: Revert 154457 - Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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.h
===================================================================
--- chrome/browser/chromeos/login/parallel_authenticator.h (revision 154482)
+++ chrome/browser/chromeos/login/parallel_authenticator.h (working copy)
@@ -12,12 +12,11 @@
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
+#include "chrome/browser/chromeos/login/authenticator.h"
#include "chrome/browser/chromeos/login/auth_attempt_state.h"
#include "chrome/browser/chromeos/login/auth_attempt_state_resolver.h"
-#include "chrome/browser/chromeos/login/authenticator.h"
#include "chrome/browser/chromeos/login/online_attempt.h"
#include "chrome/browser/chromeos/login/test_attempt_state.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chrome/common/net/gaia/gaia_auth_consumer.h"
class LoginFailure;
@@ -220,9 +219,9 @@
// Returns true if the owner check has been successful or if it is not needed.
bool VerifyOwner();
- // Handles completion of the ownership check and continues login.
- void OnOwnershipChecked(DeviceSettingsService::OwnershipStatus status,
- bool is_owner);
+ // checks if the current mounted home contains the owner case and either
+ // continues or fails the log-in. Used for policy lost mitigation "safe-mode".
+ void FinishVerifyOwnerOnFileThread();
// Records OAuth1 access token verification failure for |user_account|.
void RecordOAuthCheckFailure(const std::string& user_account);
@@ -253,6 +252,8 @@
// of it.
bool owner_is_verified_;
bool user_can_login_;
+ // A lock for |owner_is_verified_| and |user_can_login_|.
+ base::Lock owner_verified_lock_;
// True if we use OAuth-based authentication flow.
bool using_oauth_;
« no previous file with comments | « chrome/browser/chromeos/login/login_utils_browsertest.cc ('k') | chrome/browser/chromeos/login/parallel_authenticator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698