Make WindowTree::SetModal() take the type.

services/ui/ws/event_dispatcher_unittest.cc

Index: services/ui/ws/event_dispatcher_unittest.cc
diff --git a/services/ui/ws/event_dispatcher_unittest.cc b/services/ui/ws/event_dispatcher_unittest.cc
index d78af7d52fc7d4aee360c3c7c3d6220d9dbb87fb..131d793fc1c78673b23d643f40ffedd7af69854d 100644
--- a/services/ui/ws/event_dispatcher_unittest.cc
+++ b/services/ui/ws/event_dispatcher_unittest.cc
@@ -1376,7 +1376,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOnModalParent) {
   w2->SetBounds(gfx::Rect(50, 10, 10, 10));
 
   w1->AddTransientWindow(w2.get());
-  w2->SetModal();
+  w2->SetModal(MODAL_TYPE_WINDOW);
 
   // Send event that is over |w1|.
   const ui::PointerEvent mouse_pressed(ui::MouseEvent(
@@ -1409,7 +1409,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOnModalChild) {
   w2->SetBounds(gfx::Rect(50, 10, 10, 10));
 
   w1->AddTransientWindow(w2.get());
-  w2->SetModal();
+  w2->SetModal(MODAL_TYPE_WINDOW);
 
   // Send event that is over |w2|.
   const ui::PointerEvent mouse_pressed(ui::MouseEvent(
@@ -1445,7 +1445,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOnUnrelatedWindow) {
   w3->SetBounds(gfx::Rect(70, 10, 10, 10));
 
   w1->AddTransientWindow(w2.get());
-  w2->SetModal();
+  w2->SetModal(MODAL_TYPE_WINDOW);
 
   // Send event that is over |w3|.
   const ui::PointerEvent mouse_pressed(ui::MouseEvent(
@@ -1482,7 +1482,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOnDescendantOfModalParent) {
   w2->SetBounds(gfx::Rect(50, 10, 10, 10));
 
   w1->AddTransientWindow(w2.get());
-  w2->SetModal();
+  w2->SetModal(MODAL_TYPE_WINDOW);
 
   // Send event that is over |w11|.
   const ui::PointerEvent mouse_pressed(ui::MouseEvent(
@@ -1511,7 +1511,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOnSystemModal) {
 
   root_window()->SetBounds(gfx::Rect(0, 0, 100, 100));
   w1->SetBounds(gfx::Rect(10, 10, 30, 30));
-  w1->SetModal();
+  w1->SetModal(MODAL_TYPE_SYSTEM);
 
   // Send event that is over |w1|.
   const ui::PointerEvent mouse_pressed(ui::MouseEvent(
@@ -1540,7 +1540,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOutsideSystemModal) {
 
   root_window()->SetBounds(gfx::Rect(0, 0, 100, 100));
   w1->SetBounds(gfx::Rect(10, 10, 30, 30));
-  w1->SetModal();
+  w1->SetModal(MODAL_TYPE_SYSTEM);
   event_dispatcher()->AddSystemModalWindow(w1.get());
 
   // Send event that is over |w1|.
@@ -1577,7 +1577,7 @@ TEST_F(EventDispatcherTest, ModalWindowSetCaptureDescendantOfModalParent) {
   w2->SetBounds(gfx::Rect(50, 10, 10, 10));
 
   w1->AddTransientWindow(w2.get());
-  w2->SetModal();
+  w2->SetModal(MODAL_TYPE_WINDOW);
 
   EXPECT_FALSE(event_dispatcher()->SetCaptureWindow(w11.get(), kClientAreaId));
   EXPECT_EQ(nullptr, event_dispatcher()->capture_window());
@@ -1595,7 +1595,7 @@ TEST_F(EventDispatcherTest, ModalWindowSetCaptureUnrelatedWindow) {
   w3->SetBounds(gfx::Rect(70, 10, 10, 10));
 
   w1->AddTransientWindow(w2.get());
-  w2->SetModal();
+  w2->SetModal(MODAL_TYPE_WINDOW);
 
   EXPECT_TRUE(event_dispatcher()->SetCaptureWindow(w3.get(), kClientAreaId));
   EXPECT_EQ(w3.get(), event_dispatcher()->capture_window());