Index: ash/wm/workspace_controller_unittest.cc |
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc |
index 4b5fd92675f4f21cff2c13341112719aff87914e..e25a3d39b23012ea16faefe0f2ad97d2db0e1718 100644 |
--- a/ash/wm/workspace_controller_unittest.cc |
+++ b/ash/wm/workspace_controller_unittest.cc |
@@ -33,6 +33,7 @@ |
#include "ui/events/event_utils.h" |
#include "ui/gfx/screen.h" |
#include "ui/views/corewm/window_animations.h" |
+#include "ui/views/corewm/window_util.h" |
#include "ui/views/widget/widget.h" |
using aura::Window; |
@@ -677,7 +678,8 @@ TEST_F(WorkspaceControllerTest, TransientParent) { |
// Window with a transient parent. We set the transient parent to the root, |
// which would never happen but is enough to exercise the bug. |
scoped_ptr<Window> w1(CreateTestWindowUnparented()); |
- Shell::GetInstance()->GetPrimaryRootWindow()->AddTransientChild(w1.get()); |
+ views::corewm::AddTransientChild( |
+ Shell::GetInstance()->GetPrimaryRootWindow(), w1.get()); |
w1->SetBounds(gfx::Rect(10, 11, 250, 251)); |
ParentWindowInPrimaryRootWindow(w1.get()); |
w1->Show(); |
@@ -1132,7 +1134,7 @@ TEST_F(WorkspaceControllerTest, VerifyLayerOrdering) { |
ui::wm::WINDOW_TYPE_POPUP, |
gfx::Rect(5, 6, 7, 8), |
NULL); |
- browser->AddTransientChild(status_bubble); |
+ views::corewm::AddTransientChild(browser.get(), status_bubble); |
ParentWindowInPrimaryRootWindow(status_bubble); |
status_bubble->SetName("status_bubble"); |