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

Unified Diff: chrome/browser/ui/ash/lock_screen_client.cc

Issue 2896093003: cros: Make sure views-based lock screen is destroyed after it is dismissed. (Closed)
Patch Set: Address comments Created 3 years, 6 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
« no previous file with comments | « chrome/browser/ui/ash/lock_screen_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/lock_screen_client.cc
diff --git a/chrome/browser/ui/ash/lock_screen_client.cc b/chrome/browser/ui/ash/lock_screen_client.cc
index d1f537d0147eac4eb002b5ff229e3b0565856e3f..6160f3501ef5a3b404d51a6c7a6c1218df336978 100644
--- a/chrome/browser/ui/ash/lock_screen_client.cc
+++ b/chrome/browser/ui/ash/lock_screen_client.cc
@@ -39,7 +39,8 @@ LockScreenClient* LockScreenClient::Get() {
void LockScreenClient::AuthenticateUser(const AccountId& account_id,
const std::string& hashed_password,
- bool authenticated_by_pin) {
+ bool authenticated_by_pin,
+ AuthenticateUserCallback callback) {
// TODO(xiaoyinh): Complete the implementation below.
// It should be similar as SigninScreenHandler::HandleAuthenticateUser.
chromeos::UserContext user_context(account_id);
@@ -47,7 +48,13 @@ void LockScreenClient::AuthenticateUser(const AccountId& account_id,
std::string(), hashed_password);
user_context.SetKey(key);
user_context.SetIsUsingPin(authenticated_by_pin);
- chromeos::ScreenLocker::default_screen_locker()->Authenticate(user_context);
+ chromeos::ScreenLocker::default_screen_locker()->Authenticate(
+ user_context, std::move(callback));
+}
+
+void LockScreenClient::ShowLockScreen(
+ ash::mojom::LockScreen::ShowLockScreenCallback on_shown) {
+ lock_screen_->ShowLockScreen(std::move(on_shown));
}
void LockScreenClient::AttemptUnlock(const AccountId& account_id) {
« no previous file with comments | « chrome/browser/ui/ash/lock_screen_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698