diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 19:39:52 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 19:39:52 +0000 |
| commit | 59de2a5b74f3eb90eabaf5f7954cb0588ffd2fed (patch) | |
| tree | 01435c14ad5a6aab5a68d476cf76090ea4849317 /ash/test | |
| parent | e4423ebba6018ae09604b6cf3d129960cff648d1 (diff) | |
| download | chromium_src-59de2a5b74f3eb90eabaf5f7954cb0588ffd2fed.zip chromium_src-59de2a5b74f3eb90eabaf5f7954cb0588ffd2fed.tar.gz chromium_src-59de2a5b74f3eb90eabaf5f7954cb0588ffd2fed.tar.bz2 | |
Show rootwindow in ash test
This is probably overlooked when ShowRootWindow is added.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11412259
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/ash_test_base.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 0280e61..479bc40 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -12,8 +12,10 @@ #include "ash/shell.h" #include "ash/test/display_manager_test_api.h" #include "ash/test/test_shell_delegate.h" +#include "base/command_line.h" #include "base/run_loop.h" #include "content/public/test/web_contents_tester.h" +#include "ui/aura/aura_switches.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" @@ -41,6 +43,8 @@ AshTestBase::~AshTestBase() { } void AshTestBase::SetUp() { + CommandLine::ForCurrentProcess()->AppendSwitchASCII( + switches::kAuraHostWindowSize, "0+0-800x600"); // Disable animations during tests. ui::LayerAnimator::set_disable_animations_for_test(true); ui::TextInputTestSupport::Initialize(); @@ -48,10 +52,10 @@ void AshTestBase::SetUp() { test_shell_delegate_ = new TestShellDelegate; ash::Shell::CreateInstance(test_shell_delegate_); Shell::GetPrimaryRootWindow()->Show(); + Shell::GetPrimaryRootWindow()->ShowRootWindow(); // Move the mouse cursor to far away so that native events doesn't // interfere test expectations. Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000)); - UpdateDisplay("800x600"); Shell::GetInstance()->cursor_manager()->ShowCursor(true); } |