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

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

Issue 585213002: [Easy signin] Wire up userClick auth attempt to easy unlock app and back (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@easy_signin_focused_user_changed_observer
Patch Set: fix screenlock private test Created 6 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/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 1afaf157575ee1ccea1638f61e1db278b018e493..35abeb32ff13107673ffd8f3349500614de7f9ec 100644
--- a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
+++ b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
@@ -161,6 +161,15 @@ std::string EasyUnlockServiceSignin::GetChallenge() const {
return data->devices[device_index].challenge;
}
+std::string EasyUnlockServiceSignin::GetWrappedSecret() const {
+ const UserData* data = FindLoadedDataForCurrentUser();
+ // TODO(xiyuan): Use correct remote device instead of hard coded first one.
+ uint32 device_index = 0;
+ if (!data || data->devices.size() <= device_index)
+ return std::string();
+ return data->devices[device_index].wrapped_secret;
+}
+
void EasyUnlockServiceSignin::InitializeInternal() {
if (chromeos::LoginState::Get()->IsUserLoggedIn())
return;
@@ -208,7 +217,7 @@ void EasyUnlockServiceSignin::OnFocusedUserChanged(const std::string& user_id) {
bool should_update_app_state = user_id_.empty() != user_id.empty();
user_id_ = user_id;
- ResetScreenlockStateHandler();
+ ResetScreenlockState();
if (should_update_app_state) {
UpdateAppState();
« no previous file with comments | « chrome/browser/signin/easy_unlock_service_signin_chromeos.h ('k') | chrome/browser/signin/screenlock_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698