[mus+ash] removes WmWindow, wm_window.h and wm_window.cc

ash/shell_port.cc

 // Copyright 2016 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_port.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/app_list_shelf_item_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/wm/root_window_finder.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
-#include "ash/wm_window.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
+#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window.h"
 #include "ui/display/display.h"
 
 namespace ash {
 
 // static
 ShellPort* ShellPort::instance_ = nullptr;
 
 ShellPort::~ShellPort() {
   DCHECK_EQ(this, instance_);
   instance_ = nullptr;
@@ skipping 40 matching lines @@
 bool ShellPort::IsForceMaximizeOnFirstRun() {
   return Shell::Get()->shell_delegate()->IsForceMaximizeOnFirstRun();
 }
 
 bool ShellPort::IsSystemModalWindowOpen() {
   if (simulate_modal_window_open_for_testing_)
     return true;
 
   // Traverse all system modal containers, and find its direct child window
   // with "SystemModal" setting, and visible.
-  for (WmWindow* root : GetAllRootWindows()) {
-    WmWindow* system_modal =
-        root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
+  for (aura::Window* root : GetAllRootWindows()) {
+    aura::Window* system_modal =
+        root->GetChildById(kShellWindowId_SystemModalContainer);
     if (!system_modal)
       continue;
-    for (const WmWindow* child : system_modal->GetChildren()) {
-      if (child->IsSystemModal() && child->GetTargetVisibility()) {
+    for (const aura::Window* child : system_modal->children()) {
+      if (child->GetProperty(aura::client::kModalKey) ==
+              ui::MODAL_TYPE_SYSTEM &&
+          child->layer()->GetTargetVisibility()) {
         return true;
       }
     }
   }
   return false;
 }
 
 void ShellPort::CreateModalBackground(aura::Window* window) {
   for (aura::Window* root_window : Shell::GetAllRootWindows()) {
     RootWindowController::ForWindow(root_window)
@@ skipping 12 matching lines @@
     }
   }
   for (aura::Window* root_window : root_windows) {
     RootWindowController::ForWindow(root_window)
         ->GetSystemModalLayoutManager(removed)
         ->DestroyModalBackground();
   }
 }
 
 }  // namespace ash