mash: Run pre-unlock animation via SessionController

ash/shell.cc

 // Copyright (c) 2012 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 "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 315 matching lines @@
 void Shell::SetDisplayWorkAreaInsets(Window* contains,
                                      const gfx::Insets& insets) {
   wm_shell_->SetDisplayWorkAreaInsets(WmWindow::Get(contains), insets);
 }
 
 void Shell::OnAppTerminating() {
   for (auto& observer : shell_observers_)
     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);
 }
 
 void Shell::OnRootWindowAdded(WmWindow* root_window) {
   for (auto& observer : shell_observers_)
     observer.OnRootWindowAdded(root_window);
 }
 
@@ skipping 884 matching lines @@
 }
 
 void Shell::LoginStatusChanged(LoginStatus login_status) {
   UpdateAfterLoginStatusChange(login_status);
 
   // TODO(xiyuan): Update OnLoginStateChanged -> OnLoginStatusChanged.
   for (auto& observer : shell_observers_)
     observer.OnLoginStateChanged(login_status);
 }
 
+void Shell::OnLockStateChanged(bool locked) {
+  for (auto& observer : shell_observers_)
+    observer.OnLockStateChanged(locked);

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

Aside: It's unfortunate that we have Shell observers for LockStateChanged and
also SessionStateObservers. Maybe not for this CL, but WDYT of converting
ShellObservers for OnLockStateChanged() to SessionStateObservers?

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

SGTM. Added a TODO. I have thought about doing that. A follow up CL would be
better than in this CL. 

+#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_)
     return;
   DCHECK(pref_service);
   pref_service_ = std::move(pref_service);
 }
 
 }  // namespace ash