| Index: ash/test/ash_test_base.cc
|
| diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
|
| index 479bc40ca88141b5523501964e73a37fc3f990cb..f308e6960a51cbb2f00bd889b225d4ee618dc900 100644
|
| --- a/ash/test/ash_test_base.cc
|
| +++ b/ash/test/ash_test_base.cc
|
| @@ -26,6 +26,10 @@
|
| #include "ui/gfx/display.h"
|
| #include "ui/gfx/screen.h"
|
|
|
| +#if defined(OS_WIN)
|
| +#include "ui/aura/root_window_host_win.h"
|
| +#endif
|
| +
|
| namespace ash {
|
| namespace test {
|
|
|
| @@ -43,8 +47,13 @@ AshTestBase::~AshTestBase() {
|
| }
|
|
|
| void AshTestBase::SetUp() {
|
| + // Use the origin (1,1) so that it doesn't over
|
| + // lap with the native mouse cursor.
|
| CommandLine::ForCurrentProcess()->AppendSwitchASCII(
|
| - switches::kAuraHostWindowSize, "0+0-800x600");
|
| + switches::kAuraHostWindowSize, "1+1-800x600");
|
| +#if defined(OS_WIN)
|
| + aura::test::SetUsePopupAsRootWindowForTest(true);
|
| +#endif
|
| // Disable animations during tests.
|
| ui::LayerAnimator::set_disable_animations_for_test(true);
|
| ui::TextInputTestSupport::Initialize();
|
| @@ -67,6 +76,9 @@ void AshTestBase::TearDown() {
|
| Shell::DeleteInstance();
|
| aura::Env::DeleteInstance();
|
| ui::TextInputTestSupport::Shutdown();
|
| +#if defined(OS_WIN)
|
| + aura::test::SetUsePopupAsRootWindowForTest(false);
|
| +#endif
|
| }
|
|
|
| void AshTestBase::ChangeDisplayConfig(float scale,
|
|
|