mash: Run pre-unlock animation via SessionController

chrome/browser/chromeos/login/lock/screen_locker.cc

Index: chrome/browser/chromeos/login/lock/screen_locker.cc
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc
index e1ed221d5413c7acd575ad35223a94729161307f..e4c547959279fc44e44ebc7d88d19de2eca9f157 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker.cc
+++ b/chrome/browser/chromeos/login/lock/screen_locker.cc
@@ -41,6 +41,7 @@
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/ui/ash/session_controller_client.h"
 #include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h"
 #include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h"
 #include "chrome/common/chrome_switches.h"
@@ -472,19 +473,8 @@ void ScreenLocker::Hide() {
   }
 
   DCHECK(screen_locker_);
-
-  // Sets session state to ACTIVE before destroying screen locker. Otherwise,
-  // ash thinks the session is blocked and does not correct set focus on
-  // screen lock dismissal.
-  // TODO(xiyuan): Figure out a better way to ensure state change go through.
-  session_manager::SessionManager::Get()->SetSessionState(
-      session_manager::SessionState::ACTIVE);
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE, base::Bind([] {
-        base::Callback<void(void)> callback =
-            base::Bind(&ScreenLocker::ScheduleDeletion);
-        ash::Shell::Get()->lock_state_controller()->OnLockScreenHide(callback);
-      }));
+  SessionControllerClient::Get()->RunUnlockAnimation(
+      base::Bind(&ScreenLocker::ScheduleDeletion));
 }
 
 // static
@@ -527,6 +517,9 @@ ScreenLocker::~ScreenLocker() {
   DBusThreadManager::Get()->GetSessionManagerClient()->
       NotifyLockScreenDismissed();
 
+  session_manager::SessionManager::Get()->SetSessionState(

[James Cook, 2017/04/07 20:26:55]

Just to double-check: If you click "sign out" from the lock screen, what
happens? Does that destroy the screen locker?

[xiyuan, 2017/04/07 21:50:01]

ScreenLocker::Signout would be called to do a chrome::AttemptUserExit().
ScreenLocker would be visible during the shutdown. Think it is leaked in this
case.

This session state -> ACTIVE statement was here before I switch to use
SessionController. It is move to ScreenLocker::Hide to restore the active window
properly. This CL makes SessionController aware of the unlock animation starts
and included that in IsUserSessionBlocked. So this can be moved back to where it
was. :)

+      session_manager::SessionState::ACTIVE);
+
   if (saved_ime_state_.get()) {
     input_method::InputMethodManager::Get()->SetState(saved_ime_state_);
   }