Add system modals to the proper container in mus+ash.

ash/mus/window_manager.cc

 // Copyright 2015 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/mus/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 20 matching lines @@
 #include "ash/shell_init_params.h"
 #include "ash/wm/ash_focus_rules.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/common/accelerator_util.h"
 #include "services/ui/common/types.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/capture_synchronizer.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/base/class_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/display/display_observer.h"
@@ skipping 263 matching lines @@
 bool WindowManager::OnWmSetProperty(
     aura::Window* window,
     const std::string& name,
     std::unique_ptr<std::vector<uint8_t>>* new_data) {
   if (property_converter_->IsTransportNameRegistered(name))
     return true;
   DVLOG(1) << "unknown property changed, ignoring " << name;
   return false;
 }
 
+void WindowManager::OnWmSetModalType(aura::Window* window, ui::ModalType type) {

[sky, 2017/03/17 21:37:46]

I'm a little surprised we need this, but I guess that's because classic ash only
allows the modality to be set before parenting.

+  ui::ModalType old_type = window->GetProperty(aura::client::kModalKey);
+  if (type == old_type)
+    return;
+
+  window->SetProperty(aura::client::kModalKey, type);
+  if (type != ui::MODAL_TYPE_SYSTEM && old_type != ui::MODAL_TYPE_SYSTEM)
+    return;
+
+  if (window->parent())
+    window->parent()->RemoveChild(window);
+  int32_t new_container_id = type == ui::MODAL_TYPE_SYSTEM

[sky, 2017/03/17 21:37:46]

Can you use GetDefaultParent? In container_finder?

[Hadi, 2017/03/20 15:03:29]

Done.

+                                 ? kShellWindowId_SystemModalContainer
+                                 : kShellWindowId_DefaultContainer;
+  Shell::GetContainer(Shell::GetPrimaryRootWindow(), new_container_id)
+      ->AddChild(window);
+}
+
 void WindowManager::OnWmSetCanFocus(aura::Window* window, bool can_focus) {
   NonClientFrameController* non_client_frame_controller =
       NonClientFrameController::Get(window);
   if (non_client_frame_controller)
     non_client_frame_controller->set_can_activate(can_focus);
 }
 
 aura::Window* WindowManager::OnWmCreateTopLevelWindow(
     ui::mojom::WindowType window_type,
     std::map<std::string, std::vector<uint8_t>>* properties) {
@@ skipping 121 matching lines @@
 bool WindowManager::IsWindowActive(aura::Window* window) {
   return Shell::GetInstance()->activation_client()->GetActiveWindow() == window;
 }
 
 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
   Shell::GetInstance()->activation_client()->DeactivateWindow(window);
 }
 
 }  // namespace mus
 }  // namespace ash