| Index: ash/wm/dock/docked_window_resizer_unittest.cc
|
| diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc
|
| index b15117d092a3782ccc4690678a29fbe6d40479f9..05cb9b313cf86958ace6b2627b4a661b5ec0d4e9 100644
|
| --- a/ash/wm/dock/docked_window_resizer_unittest.cc
|
| +++ b/ash/wm/dock/docked_window_resizer_unittest.cc
|
| @@ -32,6 +32,7 @@
|
| #include "ui/aura/test/test_window_delegate.h"
|
| #include "ui/base/hit_test.h"
|
| #include "ui/base/ui_base_types.h"
|
| +#include "ui/views/corewm/window_util.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| namespace ash {
|
| @@ -1295,10 +1296,10 @@ TEST_P(DockedWindowResizerTest, DragWindowWithTransientChild) {
|
| scoped_ptr<aura::Window> window(CreateTestWindow(gfx::Rect(0, 0, 201, 201)));
|
| scoped_ptr<aura::Window> child(CreateTestWindowInShellWithDelegateAndType(
|
| NULL, ui::wm::WINDOW_TYPE_NORMAL, 0, gfx::Rect(20, 20, 150, 20)));
|
| - window->AddTransientChild(child.get());
|
| + views::corewm::AddTransientChild(window.get(), child.get());
|
| if (window->parent() != child->parent())
|
| window->parent()->AddChild(child.get());
|
| - EXPECT_EQ(window.get(), child->transient_parent());
|
| + EXPECT_EQ(window.get(), views::corewm::GetTransientParent(child.get()));
|
|
|
| DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, window.get(), 20);
|
|
|
| @@ -1345,8 +1346,8 @@ TEST_P(DockedWindowResizerTest, DragWindowWithModalTransientChild) {
|
| // While still dragging create a modal window and make it a transient child of
|
| // the |window|.
|
| scoped_ptr<aura::Window> child(CreateModalWindow(gfx::Rect(20, 20, 150, 20)));
|
| - window->AddTransientChild(child.get());
|
| - EXPECT_EQ(window.get(), child->transient_parent());
|
| + views::corewm::AddTransientChild(window.get(), child.get());
|
| + EXPECT_EQ(window.get(), views::corewm::GetTransientParent(child.get()));
|
| EXPECT_EQ(internal::kShellWindowId_SystemModalContainer,
|
| child->parent()->id());
|
|
|
| @@ -1366,7 +1367,7 @@ TEST_P(DockedWindowResizerTest, DragWindowWithModalTransientChild) {
|
| EXPECT_EQ(gfx::Point(20, 20).ToString(),
|
| child->GetBoundsInScreen().origin().ToString());
|
| // The |child| should still be a transient child of |window|.
|
| - EXPECT_EQ(window.get(), child->transient_parent());
|
| + EXPECT_EQ(window.get(), views::corewm::GetTransientParent(child.get()));
|
| }
|
|
|
| // Tests that side snapping a window undocks it, closes the dock and then snaps.
|
|
|