| Index: ash/common/test/ash_test.cc
|
| diff --git a/ash/common/test/ash_test.cc b/ash/common/test/ash_test.cc
|
| index 219a0519862f5cf04e717498e54bcef8f818def2..291e0a93111eff8769112494e3336502da41f944 100644
|
| --- a/ash/common/test/ash_test.cc
|
| +++ b/ash/common/test/ash_test.cc
|
| @@ -5,7 +5,9 @@
|
| #include "ash/common/test/ash_test.h"
|
|
|
| #include "ash/common/test/ash_test_impl.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| +#include "ui/compositor/layer_type.h"
|
| #include "ui/display/display.h"
|
|
|
| namespace ash {
|
| @@ -34,6 +36,19 @@ std::unique_ptr<WindowOwner> AshTest::CreateTestWindow(const gfx::Rect& bounds,
|
| return test_impl_->CreateTestWindow(bounds, type, shell_window_id);
|
| }
|
|
|
| +std::unique_ptr<WindowOwner> AshTest::CreateChildWindow(WmWindow* parent,
|
| + const gfx::Rect& bounds,
|
| + int shell_window_id) {
|
| + std::unique_ptr<WindowOwner> window_owner =
|
| + base::MakeUnique<WindowOwner>(WmShell::Get()->NewWindow(
|
| + ui::wm::WINDOW_TYPE_NORMAL, ui::LAYER_NOT_DRAWN));
|
| + window_owner->window()->SetBounds(bounds);
|
| + window_owner->window()->SetShellWindowId(shell_window_id);
|
| + parent->AddChild(window_owner->window());
|
| + window_owner->window()->Show();
|
| + return window_owner;
|
| +}
|
| +
|
| display::Display AshTest::GetSecondaryDisplay() {
|
| return test_impl_->GetSecondaryDisplay();
|
| }
|
|
|