Inform window manager about modal windows in mus+ash.

services/ui/ws/window_tree_unittest.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 <stdint.h>
 
 #include <string>
 #include <vector>
@@ skipping 784 matching lines @@
   ASSERT_TRUE(tree->SetWindowVisibility(w11_id, true));
 
   // Create |w2| as a child of |root_window| and modal to |w1| and leave it
   // hidden.
   ClientWindowId w2_id = BuildClientWindowId(tree, 2);
   ASSERT_TRUE(tree->NewWindow(w2_id, ServerWindow::Properties()));
   ServerWindow* w2 = tree->GetWindowByClientId(w2_id);
   w2->SetBounds(gfx::Rect(50, 10, 10, 10));
   ASSERT_TRUE(tree->AddWindow(root_window_id, w2_id));
   ASSERT_TRUE(tree->AddTransientWindow(w1_id, w2_id));
-  ASSERT_TRUE(tree->SetModalType(w2_id, MODAL_TYPE_WINDOW));
+  ASSERT_TRUE(tree->SetModalType(w2, MODAL_TYPE_WINDOW));
 
   // Set capture to |w11|.
   DispatchEventWithoutAck(CreatePointerDownEvent(25, 25));
   ASSERT_TRUE(tree->SetCapture(w11_id));
   EXPECT_EQ(w11, GetCaptureWindow(display));
   AckPreviousEvent();
 
   // Make |w2| visible. This should release capture as capture is set to a
   // descendant of the modal parent.
   ASSERT_TRUE(tree->SetWindowVisibility(w2_id, true));
@@ skipping 32 matching lines @@
 
   // Set capture to |w11|.
   DispatchEventWithoutAck(CreatePointerDownEvent(25, 25));
   ASSERT_TRUE(tree->SetCapture(w11_id));
   EXPECT_EQ(w11, GetCaptureWindow(display));
   AckPreviousEvent();
 
   // Set |w2| modal to |w1|. This should release the capture as the capture is
   // set to a descendant of the modal parent.
   ASSERT_TRUE(tree->AddTransientWindow(w1_id, w2_id));
-  ASSERT_TRUE(tree->SetModalType(w2_id, MODAL_TYPE_WINDOW));
+  ASSERT_TRUE(tree->SetModalType(w2, MODAL_TYPE_WINDOW));
   EXPECT_EQ(nullptr, GetCaptureWindow(display));
 }
 
 // Tests that showing a modal window does not change capture if the capture is
 // not on a descendant of the modal parent.
 TEST_F(WindowTreeTest, ShowModalWindowWithNonDescendantCapture) {
   TestWindowTreeClient* embed_client = nullptr;
   WindowTree* tree = nullptr;
   ServerWindow* w1 = nullptr;
   EXPECT_NO_FATAL_FAILURE(SetupEventTargeting(&embed_client, &tree, &w1));
 
   w1->SetBounds(gfx::Rect(10, 10, 30, 30));
   const ServerWindow* root_window = *tree->roots().begin();
   ClientWindowId root_window_id = ClientWindowIdForWindow(tree, root_window);
   ClientWindowId w1_id = ClientWindowIdForWindow(tree, w1);
   Display* display = tree->GetDisplay(w1);
 
   // Create |w2| as a child of |root_window| and modal to |w1| and leave it
   // hidden.
   ClientWindowId w2_id = BuildClientWindowId(tree, 2);
   ASSERT_TRUE(tree->NewWindow(w2_id, ServerWindow::Properties()));
   ServerWindow* w2 = tree->GetWindowByClientId(w2_id);
   w2->SetBounds(gfx::Rect(50, 10, 10, 10));
   ASSERT_TRUE(tree->AddWindow(root_window_id, w2_id));
   ASSERT_TRUE(tree->AddTransientWindow(w1_id, w2_id));
-  ASSERT_TRUE(tree->SetModalType(w2_id, MODAL_TYPE_WINDOW));
+  ASSERT_TRUE(tree->SetModalType(w2, MODAL_TYPE_WINDOW));
 
   // Create |w3| as a child of |root_window| and make it visible.
   ClientWindowId w3_id = BuildClientWindowId(tree, 3);
   ASSERT_TRUE(tree->NewWindow(w3_id, ServerWindow::Properties()));
   ServerWindow* w3 = tree->GetWindowByClientId(w3_id);
   w3->SetBounds(gfx::Rect(70, 10, 10, 10));
   ASSERT_TRUE(tree->AddWindow(root_window_id, w3_id));
   ASSERT_TRUE(tree->SetWindowVisibility(w3_id, true));
 
   // Set capture to |w3|.
@@ skipping 39 matching lines @@
 
   // Set capture to |w3|.
   DispatchEventWithoutAck(CreatePointerDownEvent(25, 25));
   ASSERT_TRUE(tree->SetCapture(w3_id));
   EXPECT_EQ(w3, GetCaptureWindow(display));
   AckPreviousEvent();
 
   // Set |w2| modal to |w1|. This should not release the capture as the capture
   // is not set to a descendant of the modal parent.
   ASSERT_TRUE(tree->AddTransientWindow(w1_id, w2_id));
-  ASSERT_TRUE(tree->SetModalType(w2_id, MODAL_TYPE_WINDOW));
+  ASSERT_TRUE(tree->SetModalType(w2, MODAL_TYPE_WINDOW));
   EXPECT_EQ(w3, GetCaptureWindow(display));
 }
 
 // Tests that showing a system modal window releases the capture.
 TEST_F(WindowTreeTest, ShowSystemModalWindowWithCapture) {
   TestWindowTreeClient* embed_client = nullptr;
   WindowTree* tree = nullptr;
   ServerWindow* w1 = nullptr;
   EXPECT_NO_FATAL_FAILURE(SetupEventTargeting(&embed_client, &tree, &w1));
 
   w1->SetBounds(gfx::Rect(10, 10, 10, 10));
   const ServerWindow* root_window = *tree->roots().begin();
   ClientWindowId root_window_id = ClientWindowIdForWindow(tree, root_window);
   ClientWindowId w1_id = ClientWindowIdForWindow(tree, w1);
   Display* display = tree->GetDisplay(w1);
 
   // Create a system modal window |w2| as a child of |root_window| and leave it
   // hidden.
   ClientWindowId w2_id = BuildClientWindowId(tree, 2);
   ASSERT_TRUE(tree->NewWindow(w2_id, ServerWindow::Properties()));
   ServerWindow* w2 = tree->GetWindowByClientId(w2_id);
   w2->SetBounds(gfx::Rect(30, 10, 10, 10));
   ASSERT_TRUE(tree->AddWindow(root_window_id, w2_id));
-  ASSERT_TRUE(tree->SetModalType(w2_id, MODAL_TYPE_SYSTEM));
+  ASSERT_TRUE(tree->SetModalType(w2, MODAL_TYPE_SYSTEM));
 
   // Set capture to |w1|.
   DispatchEventWithoutAck(CreatePointerDownEvent(15, 15));
   ASSERT_TRUE(tree->SetCapture(w1_id));
   EXPECT_EQ(w1, GetCaptureWindow(display));
   AckPreviousEvent();
 
   // Make |w2| visible. This should release capture as it is system modal
   // window.
   ASSERT_TRUE(tree->SetWindowVisibility(w2_id, true));
@@ skipping 21 matching lines @@
   ASSERT_TRUE(tree->AddWindow(root_window_id, w2_id));
   ASSERT_TRUE(tree->SetWindowVisibility(w2_id, true));
 
   // Set capture to |w1|.
   DispatchEventWithoutAck(CreatePointerDownEvent(15, 15));
   ASSERT_TRUE(tree->SetCapture(w1_id));
   EXPECT_EQ(w1, GetCaptureWindow(display));
   AckPreviousEvent();
 
   // Make |w2| modal to system. This should release capture.
-  ASSERT_TRUE(tree->SetModalType(w2_id, MODAL_TYPE_SYSTEM));
+  ASSERT_TRUE(tree->SetModalType(w2, MODAL_TYPE_SYSTEM));
   EXPECT_EQ(nullptr, GetCaptureWindow(display));
 }
 
 // Tests that moving the capture window to a modal parent releases the capture
 // as capture cannot be blocked by a modal window.
 TEST_F(WindowTreeTest, MoveCaptureWindowToModalParent) {
   TestWindowTreeClient* embed_client = nullptr;
   WindowTree* tree = nullptr;
   ServerWindow* w1 = nullptr;
   EXPECT_NO_FATAL_FAILURE(SetupEventTargeting(&embed_client, &tree, &w1));
@@ skipping 14 matching lines @@
 
   ClientWindowId w3_id = BuildClientWindowId(tree, 3);
   ASSERT_TRUE(tree->NewWindow(w3_id, ServerWindow::Properties()));
   ServerWindow* w3 = tree->GetWindowByClientId(w3_id);
   w3->SetBounds(gfx::Rect(70, 10, 10, 10));
   ASSERT_TRUE(tree->AddWindow(root_window_id, w3_id));
   ASSERT_TRUE(tree->SetWindowVisibility(w3_id, true));
 
   // Set |w2| modal to |w1|.
   ASSERT_TRUE(tree->AddTransientWindow(w1_id, w2_id));
-  ASSERT_TRUE(tree->SetModalType(w2_id, MODAL_TYPE_WINDOW));
+  ASSERT_TRUE(tree->SetModalType(w2, MODAL_TYPE_WINDOW));
 
   // Set capture to |w3|.
   DispatchEventWithoutAck(CreatePointerDownEvent(25, 25));
   ASSERT_TRUE(tree->SetCapture(w3_id));
   EXPECT_EQ(w3, GetCaptureWindow(display));
   AckPreviousEvent();
 
   // Make |w3| child of |w1|. This should release capture as |w3| is now blocked
   // by a modal window.
   ASSERT_TRUE(tree->AddWindow(w1_id, w3_id));
@@ skipping 365 matching lines @@
     client->tracker()->changes()->clear();
   }
 
   // Client should not have got any messages after shutdown.
   EXPECT_TRUE(client->tracker()->changes()->empty());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui