Use WmLayoutManager::OnChildWindowVisibilityChanged to update the system modal state.

ash/common/wm/system_modal_container_layout_manager.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/common/wm/system_modal_container_layout_manager.h"
 
 #include <cmath>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
@@ skipping 34 matching lines @@
     : container_(container) {}
 
 SystemModalContainerLayoutManager::~SystemModalContainerLayoutManager() {
   if (keyboard::KeyboardController::GetInstance())
     keyboard::KeyboardController::GetInstance()->RemoveObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SystemModalContainerLayoutManager, WmLayoutManager implementation:
 
+void SystemModalContainerLayoutManager::OnChildWindowVisibilityChanged(
+    WmWindow* window,
+    bool visible) {
+  if (GetModalType(window) != ui::MODAL_TYPE_SYSTEM)
+    return;
+
+  if (window->IsVisible()) {
+    DCHECK(!base::ContainsValue(modal_windows_, window));
+    AddModalWindow(window);
+  } else {
+    if (RemoveModalWindow(window))
+      WmShell::Get()->OnModalWindowRemoved(window);
+  }
+}
+
 void SystemModalContainerLayoutManager::OnWindowResized() {
   PositionDialogsAfterWorkAreaResize();
 }
 
 void SystemModalContainerLayoutManager::OnWindowAddedToLayout(WmWindow* child) {
   DCHECK(child->GetType() == ui::wm::WINDOW_TYPE_NORMAL ||
          child->GetType() == ui::wm::WINDOW_TYPE_POPUP);
   DCHECK(container_->GetShellWindowId() !=
              kShellWindowId_LockSystemModalContainer ||
          WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked());
@@ skipping 38 matching lines @@
   if (GetModalType(window) == ui::MODAL_TYPE_SYSTEM) {
     if (base::ContainsValue(modal_windows_, window))
       return;
     AddModalWindow(window);
   } else {
     if (RemoveModalWindow(window))
       WmShell::Get()->OnModalWindowRemoved(window);
   }
 }
 
-void SystemModalContainerLayoutManager::OnWindowVisibilityChanged(
-    WmWindow* window,
-    bool visible) {
-  if (GetModalType(window) != ui::MODAL_TYPE_SYSTEM)
-    return;
-
-  if (window->IsVisible()) {
-    AddModalWindow(window);
-  } else {
-    RemoveModalWindow(window);
-    WmShell::Get()->OnModalWindowRemoved(window);
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // SystemModalContainerLayoutManager, Keyboard::KeybaordControllerObserver
 // implementation:
 
 void SystemModalContainerLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& new_bounds) {
   PositionDialogsAfterWorkAreaResize();
 }
 
 void SystemModalContainerLayoutManager::OnKeyboardClosed() {}
@@ skipping 126 matching lines @@
 bool SystemModalContainerLayoutManager::IsBoundsCentered(
     const gfx::Rect& bounds) const {
   gfx::Point window_center = bounds.CenterPoint();
   gfx::Point container_center = GetUsableDialogArea().CenterPoint();
   return std::abs(window_center.x() - container_center.x()) <
              kCenterPixelDelta &&
          std::abs(window_center.y() - container_center.y()) < kCenterPixelDelta;
 }
 
 }  // namespace ash