Inform window manager about modal windows in mus+ash.

services/ui/ws/window_tree.cc

 // Copyright 2014 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 "services/ui/ws/window_tree.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 337 matching lines @@
   }
 
   // Have the owner of the tree service the actual delete.
   WindowTree* tree = window_server_->GetTreeWithId(window->id().client_id);
   return tree && tree->DeleteWindowImpl(this, window);
 }
 
 bool WindowTree::SetModalType(const ClientWindowId& window_id,
                               ModalType modal_type) {
   ServerWindow* window = GetWindowByClientId(window_id);
-  if (!window || !access_policy_->CanSetModal(window))
+  if (!window) {
+    DVLOG(1) << "SetModalType failed (invalid id)";
     return false;
+  }
+
+  if (ShouldRouteToWindowManager(window)) {
+    WindowTree* wm_tree = GetWindowManagerDisplayRoot(window)
+                              ->window_manager_state()
+                              ->window_tree();
+    wm_tree->window_manager_internal_->WmSetModalType(
+        wm_tree->ClientWindowIdForWindow(window).id, modal_type);
+    return true;
+  }
+
+  if (!access_policy_->CanSetModal(window)) {
+    DVLOG(1) << "SetModalType failed (access denied)";
+    return false;
+  }
 
   if (window->modal_type() == modal_type)
     return true;
 
   // TODO(moshayedi): crbug.com/697176. When modality of a window that used to
   // be a system modal changes, notify window manager state.
   auto* display_root = GetWindowManagerDisplayRoot(window);
   switch (modal_type) {
     case MODAL_TYPE_SYSTEM:
-      if (user_id_ == InvalidUserId() || !display_root)
+      if (user_id_ == InvalidUserId()) {
+        DVLOG(1) << "SetModalType failed (invalid user id)";
         return false;
+      }
+      if (!display_root) {
+        DVLOG(1) << "SetModalType failed (no display root)";
+        return false;
+      }
       window->SetModalType(modal_type);
       display_root->window_manager_state()->AddSystemModalWindow(window);
       break;
     case MODAL_TYPE_NONE:
     case MODAL_TYPE_WINDOW:
     case MODAL_TYPE_CHILD:
       window->SetModalType(modal_type);
       break;
   }
   if (display_root && modal_type != MODAL_TYPE_NONE) {
@@ skipping 1803 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui