Move yet more from WmShell to Shell

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_controller.h"
 #include "ash/common/wm/window_dimmer.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/shell.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/keyboard/keyboard_controller.h"
 
 namespace ash {
 namespace {
 
 // The center point of the window can diverge this much from the center point
@@ skipping 49 matching lines @@
 }
 
 void SystemModalContainerLayoutManager::OnWindowAddedToLayout(WmWindow* child) {
   DCHECK(child->GetType() == ui::wm::WINDOW_TYPE_NORMAL ||
          child->GetType() == ui::wm::WINDOW_TYPE_POPUP);
   // TODO(mash): IsUserSessionBlocked() depends on knowing the login state. We
   // need a non-stub version of SessionStateDelegate. crbug.com/648964
   if (!WmShell::Get()->IsRunningInMash()) {
     DCHECK(container_->GetShellWindowId() !=
                kShellWindowId_LockSystemModalContainer ||
-           WmShell::Get()->session_controller()->IsUserSessionBlocked());
+           Shell::Get()->session_controller()->IsUserSessionBlocked());
   }
   // Since this is for SystemModal, there is no good reason to add windows
   // other than MODAL_TYPE_NONE or MODAL_TYPE_SYSTEM. DCHECK to avoid simple
   // mistake.
   DCHECK_NE(GetModalType(child), ui::MODAL_TYPE_CHILD);
   DCHECK_NE(GetModalType(child), ui::MODAL_TYPE_WINDOW);
 
   child->aura_window()->AddObserver(this);
   if (GetModalType(child) == ui::MODAL_TYPE_SYSTEM && child->IsVisible())
     AddModalWindow(child);
@@ skipping 177 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