| Index: ash/wm/overview/window_selector_unittest.cc
|
| diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
|
| index 86c074270de9e4fb8d681fee71f772f6a65106e8..52bca15346a2cc19c0d69b152a583239fb4c2e27 100644
|
| --- a/ash/wm/overview/window_selector_unittest.cc
|
| +++ b/ash/wm/overview/window_selector_unittest.cc
|
| @@ -33,6 +33,7 @@
|
| #include "ui/compositor/scoped_animation_duration_scale_mode.h"
|
| #include "ui/gfx/rect_conversions.h"
|
| #include "ui/gfx/transform.h"
|
| +#include "ui/views/corewm/window_util.h"
|
|
|
| namespace ash {
|
| namespace internal {
|
| @@ -692,7 +693,7 @@ TEST_F(WindowSelectorTest, ModalChild) {
|
| scoped_ptr<aura::Window> window1(CreateWindow(bounds));
|
| scoped_ptr<aura::Window> child1(CreateWindow(bounds));
|
| child1->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
|
| - window1->AddTransientChild(child1.get());
|
| + views::corewm::AddTransientChild(window1.get(), child1.get());
|
| EXPECT_EQ(window1->parent(), child1->parent());
|
| ToggleOverview();
|
| EXPECT_TRUE(window1->IsVisible());
|
| @@ -708,7 +709,7 @@ TEST_F(WindowSelectorTest, ClickModalWindowParent) {
|
| scoped_ptr<aura::Window> window1(CreateWindow(gfx::Rect(0, 0, 180, 180)));
|
| scoped_ptr<aura::Window> child1(CreateWindow(gfx::Rect(200, 0, 180, 180)));
|
| child1->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
|
| - window1->AddTransientChild(child1.get());
|
| + views::corewm::AddTransientChild(window1.get(), child1.get());
|
| EXPECT_FALSE(WindowsOverlapping(window1.get(), child1.get()));
|
| EXPECT_EQ(window1->parent(), child1->parent());
|
| ToggleOverview();
|
| @@ -829,7 +830,7 @@ TEST_F(WindowSelectorTest, CycleMultipleDisplaysCopiesWindows) {
|
| unmoved2->SetName("unmoved2");
|
| moved1->SetName("moved1");
|
| moved1->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
|
| - moved1_trans_parent->AddTransientChild(moved1.get());
|
| + views::corewm::AddTransientChild(moved1_trans_parent.get(), moved1.get());
|
| moved1_trans_parent->SetName("moved1_trans_parent");
|
|
|
| EXPECT_EQ(root_windows[0], moved1->GetRootWindow());
|
|
|