| 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 63161766b6021af1db9fffd893778cc35404e1d9..17a692d83b79013b8e098c901d6dddc23da9b0c7 100644
|
| --- a/ash/wm/dock/docked_window_resizer_unittest.cc
|
| +++ b/ash/wm/dock/docked_window_resizer_unittest.cc
|
| @@ -87,27 +87,9 @@ class DockedWindowResizerTest
|
| }
|
| return window;
|
| }
|
| -
|
| aura::Window* CreateModalWindow(const gfx::Rect& bounds) {
|
| - aura::Window* window = new aura::Window(&delegate_);
|
| - window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_SYSTEM);
|
| - window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
|
| - window->Init(ui::LAYER_TEXTURED);
|
| - window->Show();
|
| -
|
| - if (bounds.IsEmpty()) {
|
| - ParentWindowInPrimaryRootWindow(window);
|
| - } else {
|
| - gfx::Display display =
|
| - Shell::GetScreen()->GetDisplayMatching(bounds);
|
| - aura::Window* root = ash::Shell::GetInstance()->display_controller()->
|
| - GetRootWindowForDisplayId(display.id());
|
| - gfx::Point origin = bounds.origin();
|
| - ::wm::ConvertPointFromScreen(root, &origin);
|
| - window->SetBounds(gfx::Rect(origin, bounds.size()));
|
| - aura::client::ParentWindowWithContext(window, root, bounds);
|
| - }
|
| - return window;
|
| + return CreateTestModalWindowInShellWithDelegateAndType(
|
| + &delegate_, ui::wm::WINDOW_TYPE_NORMAL, 0, bounds);
|
| }
|
|
|
| static WindowResizer* CreateSomeWindowResizer(
|
|
|