| Index: ash/wm/window_modality_controller_unittest.cc
|
| diff --git a/ash/wm/window_modality_controller_unittest.cc b/ash/wm/window_modality_controller_unittest.cc
|
| index e07be1b6a14601d9924011f3041c470cd16dd7a3..30b88fac300d4e0ff123f335dc5a4d90013988a8 100644
|
| --- a/ash/wm/window_modality_controller_unittest.cc
|
| +++ b/ash/wm/window_modality_controller_unittest.cc
|
| @@ -337,7 +337,7 @@ TEST_F(WindowModalityControllerTest, ReleaseCapture) {
|
| std::unique_ptr<aura::Window> w3(
|
| CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
|
| w3->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_CHILD);
|
| - ::wm::SetModalParent(w3.get(), w1.get());
|
| + ::wm::SetModalParent(w3.get(), w1.get(), NULL, NULL);
|
|
|
| // w1's capture should be released when w3 becomes visible.
|
| w3->Hide();
|
| @@ -632,7 +632,7 @@ TEST_F(WindowModalityControllerTest, ChildModalAncestor) {
|
| std::unique_ptr<aura::Window> w4(
|
| CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
|
| w4->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_CHILD);
|
| - ::wm::SetModalParent(w4.get(), w2.get());
|
| + ::wm::SetModalParent(w4.get(), w2.get(), NULL, NULL);
|
| ::wm::AddTransientChild(w1.get(), w4.get());
|
|
|
| wm::ActivateWindow(w1.get());
|
|
|