summaryrefslogtreecommitdiffstats
path: root/ash/test/ash_test_base.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/test/ash_test_base.cc')
-rw-r--r--ash/test/ash_test_base.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index c562330..8b0f23e 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -26,7 +26,11 @@ void AshTestBase::SetUp() {
helper_.SetUp();
// Creates Shell and hook with Desktop.
- ash::Shell::CreateInstance(new TestShellDelegate);
+ TestShellDelegate* delegate = new TestShellDelegate;
+ Shell::WindowMode window_mode = Shell::MODE_OVERLAPPING;
+ if (GetOverrideWindowMode(&window_mode))
+ delegate->SetOverrideWindowMode(window_mode);
+ ash::Shell::CreateInstance(delegate);
// Disable animations during tests.
ui::LayerAnimator::set_disable_animations_for_test(true);
@@ -42,6 +46,10 @@ void AshTestBase::TearDown() {
helper_.TearDown();
}
+bool AshTestBase::GetOverrideWindowMode(Shell::WindowMode* window_mode) {
+ return false;
+}
+
void AshTestBase::RunAllPendingInMessageLoop() {
helper_.RunAllPendingInMessageLoop(Shell::GetRootWindow());
}