mash: Run pre-unlock animation via SessionController

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index f4eb46e63f7a49b255fbc7cf1669a30511118fa6..ee4505223fd1d77e9cb0159b45defcadcf791c14 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -333,20 +333,6 @@ void Shell::OnAppTerminating() {
     observer.OnAppTerminating();
 }
 
-void Shell::OnLockStateChanged(bool locked) {
-  for (auto& observer : shell_observers_)
-    observer.OnLockStateChanged(locked);
-#ifndef NDEBUG
-  // Make sure that there is no system modal in Lock layer when unlocked.
-  if (!locked) {
-    aura::Window::Windows containers = wm::GetContainersFromAllRootWindows(
-        kShellWindowId_LockSystemModalContainer, GetPrimaryRootWindow());
-    for (aura::Window* container : containers)
-      DCHECK(container->children().empty());
-  }
-#endif
-}
-
 void Shell::OnCastingSessionStartedOrStopped(bool started) {
   for (auto& observer : shell_observers_)
     observer.OnCastingSessionStartedOrStopped(started);
@@ -1249,6 +1235,22 @@ void Shell::LoginStatusChanged(LoginStatus login_status) {
     observer.OnLoginStateChanged(login_status);
 }
 
+void Shell::LockStateChanged(bool locked) {
+  // TODO(xiyuan): Convert OnLockStateChanged() ShellObservers to
+  // SessionStateObservers.
+  for (auto& observer : shell_observers_)
+    observer.OnLockStateChanged(locked);
+#ifndef NDEBUG
+  // Make sure that there is no system modal in Lock layer when unlocked.
+  if (!locked) {
+    aura::Window::Windows containers = wm::GetContainersFromAllRootWindows(
+        kShellWindowId_LockSystemModalContainer, GetPrimaryRootWindow());
+    for (aura::Window* container : containers)
+      DCHECK(container->children().empty());
+  }
+#endif
+}
+
 void Shell::OnPrefServiceInitialized(
     std::unique_ptr<::PrefService> pref_service) {
   if (!instance_)