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

Unified Diff: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.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/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
index 0421dfa69faca9ded3fc7f4ca9e494e4ecec2d3d..ecab26cfa7867c7f80b1e827b5cb3e43718fcb14 100644
--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
@@ -41,12 +41,6 @@ EasyUnlockPrivateCryptoDelegate* GetCryptoDelegate(
->crypto_delegate();
}
-EasyUnlockScreenlockStateHandler* GetScreenlockStateHandler(
- content::BrowserContext* context) {
- return EasyUnlockService::Get(Profile::FromBrowserContext(context))
- ->GetScreenlockStateHandler();
-}
-
EasyUnlockScreenlockStateHandler::State ToScreenlockStateHandlerState(
easy_unlock_private::State state) {
switch (state) {
@@ -426,13 +420,10 @@ bool EasyUnlockPrivateUpdateScreenlockStateFunction::RunSync() {
easy_unlock_private::UpdateScreenlockState::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params.get());
- EasyUnlockScreenlockStateHandler* screenlock_state_handler =
- GetScreenlockStateHandler(browser_context());
- if (screenlock_state_handler) {
- screenlock_state_handler->ChangeState(
- ToScreenlockStateHandlerState(params->state));
+ Profile* profile = Profile::FromBrowserContext(browser_context());
+ if (EasyUnlockService::Get(profile)->UpdateScreenlockState(
+ ToScreenlockStateHandlerState(params->state)))
return true;
- }
SetError("Not allowed");
return false;
@@ -563,9 +554,13 @@ EasyUnlockPrivateTrySignInSecretFunction::
~EasyUnlockPrivateTrySignInSecretFunction() {
}
-bool EasyUnlockPrivateTrySignInSecretFunction::RunAsync() {
- SetError("Not implemented");
- SendResponse(false);
+bool EasyUnlockPrivateTrySignInSecretFunction::RunSync() {
+ scoped_ptr<easy_unlock_private::TrySignInSecret::Params> params(
+ easy_unlock_private::TrySignInSecret::Params::Create(*args_));
+ EXTENSION_FUNCTION_VALIDATE(params.get());
+
+ Profile* profile = Profile::FromBrowserContext(browser_context());
+ EasyUnlockService::Get(profile)->FinalizeSignin(params->sign_in_secret);
return true;
}
@@ -586,7 +581,8 @@ bool EasyUnlockPrivateGetUserInfoFunction::RunSync() {
new easy_unlock_private::UserInfo()));
users[0]->user_id = user_id;
users[0]->logged_in = service->GetType() == EasyUnlockService::TYPE_REGULAR;
- users[0]->data_ready = service->GetRemoteDevices() != NULL;
+ users[0]->data_ready = users[0]->logged_in ||
+ service->GetRemoteDevices() != NULL;
}
results_ = easy_unlock_private::GetUserInfo::Results::Create(users);
return true;

Powered by Google App Engine
This is Rietveld 408576698