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

Unified Diff: chrome/browser/signin/easy_unlock_service_signin_chromeos.cc

Issue 1749893002: Fix Smart Lock bugs introduced by change from raw email to AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2623
Patch Set: Created 4 years, 10 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/signin/easy_unlock_service_signin_chromeos.cc
diff --git a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
index 7868b69af844e8b67f6d7913ca25063901a54bf8..3b93ac27086446d2a04453aacda1d71dcc8ac11d 100644
--- a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
+++ b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
@@ -338,8 +338,7 @@ void EasyUnlockServiceSignin::OnFocusedUserChanged(
// these
// cases update the app state. Otherwise, it's enough to notify the app the
// user data has been updated.
- const bool should_update_app_state =
- account_id_.is_valid() != account_id.is_valid();
+ const bool should_update_app_state = (account_id_ != account_id);
account_id_ = account_id;
user_pod_last_focused_timestamp_ = base::TimeTicks::Now();
@@ -375,7 +374,7 @@ void EasyUnlockServiceSignin::LoadCurrentUserDataIfNeeded() {
if (!base::SysInfo::IsRunningOnChromeOS())
return;
- if (account_id_.is_valid() || !service_active_)
+ if (!account_id_.is_valid() || !service_active_)
return;
const auto it = user_data_.find(account_id_);
@@ -467,7 +466,7 @@ void EasyUnlockServiceSignin::OnUserDataLoaded(
const EasyUnlockServiceSignin::UserData*
EasyUnlockServiceSignin::FindLoadedDataForCurrentUser() const {
- if (account_id_.is_valid())
+ if (!account_id_.is_valid())
return nullptr;
const auto it = user_data_.find(account_id_);
« no previous file with comments | « chrome/browser/signin/easy_unlock_service_regular.cc ('k') | chrome/browser/signin/easy_unlock_service_unittest_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698