| 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..e407a391460db6cfa124dab4b53614b171a86f1a 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;
|
| }
|
|
|
|
|