Renames WmShell to ShellPort

ash/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/wm/system_modal_container_layout_manager.h"
 
 #include <cmath>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
+#include "ash/shell_port.h"
 #include "ash/wm/window_dimmer.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
 #include "ash/wm_window.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 {
 
@@ skipping 34 matching lines @@
     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);
+      ShellPort::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);
   // TODO(mash): IsUserSessionBlocked() depends on knowing the login state. We
   // need a non-stub version of SessionStateDelegate. crbug.com/648964
-  if (!WmShell::Get()->IsRunningInMash()) {
+  if (!ShellPort::Get()->IsRunningInMash()) {
     DCHECK(container_->GetShellWindowId() !=
                kShellWindowId_LockSystemModalContainer ||
            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);
 
@@ skipping 30 matching lines @@
   if (key != aura::client::kModalKey || !window->IsVisible())
     return;
 
   WmWindow* wm_window = WmWindow::Get(window);
   if (window->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_SYSTEM) {
     if (base::ContainsValue(modal_windows_, wm_window))
       return;
     AddModalWindow(wm_window);
   } else {
     if (RemoveModalWindow(wm_window))
-      WmShell::Get()->OnModalWindowRemoved(wm_window);
+      ShellPort::Get()->OnModalWindowRemoved(wm_window);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SystemModalContainerLayoutManager, Keyboard::KeybaordControllerObserver
 // implementation:
 
 void SystemModalContainerLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& new_bounds) {
   PositionDialogsAfterWorkAreaResize();
@@ skipping 56 matching lines @@
 void SystemModalContainerLayoutManager::AddModalWindow(WmWindow* window) {
   if (modal_windows_.empty()) {
     WmWindow* capture_window = WmWindow::Get(wm::GetCaptureWindow());
     if (capture_window)
       capture_window->ReleaseCapture();
   }
   DCHECK(window->IsVisible());
   DCHECK(!base::ContainsValue(modal_windows_, window));
 
   modal_windows_.push_back(window);
-  WmShell::Get()->CreateModalBackground(window);
+  ShellPort::Get()->CreateModalBackground(window);
   window->GetParent()->StackChildAtTop(window);
 
   gfx::Rect target_bounds = window->GetBounds();
   target_bounds.AdjustToFit(GetUsableDialogArea());
   window->SetBounds(target_bounds);
 }
 
 bool SystemModalContainerLayoutManager::RemoveModalWindow(WmWindow* window) {
   auto it = std::find(modal_windows_.begin(), modal_windows_.end(), window);
   if (it == modal_windows_.end())
@@ skipping 52 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