mash: Run pre-unlock animation via SessionController

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/common/wallpaper/wallpaper_controller.h"
@@ skipping 23 matching lines @@
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_factory.h"
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #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"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/audio/chromeos_sounds.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/auth/authenticator.h"
 #include "chromeos/login/auth/extended_authenticator.h"
@@ skipping 411 matching lines @@
 // static
 void ScreenLocker::Hide() {
   DCHECK(base::MessageLoopForUI::IsCurrent());
   // For a guest user, screen_locker_ would have never been initialized.
   if (user_manager::UserManager::Get()->IsLoggedInAsGuest()) {
     VLOG(1) << "Refusing to hide lock screen for guest account";
     return;
   }
 
   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
 void ScreenLocker::ScheduleDeletion() {
   // Avoid possible multiple calls.
   if (screen_locker_ == NULL)
     return;
   VLOG(1) << "Deleting ScreenLocker " << screen_locker_;
 
   AccessibilityManager::Get()->PlayEarcon(
@@ skipping 22 matching lines @@
   VLOG(1) << "Emitting SCREEN_LOCK_STATE_CHANGED with state=" << state;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::Source<ScreenLocker>(this),
       content::Details<bool>(&state));
 
   VLOG(1) << "Calling session manager's HandleLockScreenDismissed D-Bus method";
   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_);
   }
 }
 
 void ScreenLocker::SetAuthenticator(Authenticator* authenticator) {
   authenticator_ = authenticator;
 }
 
 void ScreenLocker::ScreenLockReady() {
@@ skipping 25 matching lines @@
 
 bool ScreenLocker::IsUserLoggedIn(const AccountId& account_id) const {
   for (user_manager::User* user : users_) {
     if (user->GetAccountId() == account_id)
       return true;
   }
   return false;
 }
 
 }  // namespace chromeos