diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 20:48:01 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 20:48:01 +0000 |
| commit | fca26bb7f954de3dd4ca83556b5b22f019a7c7bc (patch) | |
| tree | 9859ae157a852547057b68e6f8abf81df08de83e /ash/display | |
| parent | fe9f89a741d5939d0b59f06876d4a1ec4a45b8e3 (diff) | |
| download | chromium_src-fca26bb7f954de3dd4ca83556b5b22f019a7c7bc.zip chromium_src-fca26bb7f954de3dd4ca83556b5b22f019a7c7bc.tar.gz chromium_src-fca26bb7f954de3dd4ca83556b5b22f019a7c7bc.tar.bz2 | |
Revert 157597 - Enable UpdateDisplay to specify host origins.
UpdateDisplayWithHostOrigin test fails on Win Aura.
----
This is needed for testing coordinate conversions by way of native screen
coordinates.
BUG=148686
Review URL: https://chromiumcodereview.appspot.com/10914308
TBR=mazda@chromium.org
Review URL: https://codereview.chromium.org/10945035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/display_controller_unittest.cc | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index 9022f08..a6a8a47 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -240,39 +240,5 @@ TEST_F(DisplayControllerTest, SwapPrimary) { EXPECT_TRUE(primary_root->Contains(launcher_window)); } -TEST_F(DisplayControllerTest, UpdateDisplayWithHostOrigin) { - UpdateDisplay("100x200,300x400"); - ASSERT_EQ(2, gfx::Screen::GetNumDisplays()); - Shell::RootWindowList root_windows = - Shell::GetInstance()->GetAllRootWindows(); - ASSERT_EQ(2U, root_windows.size()); - EXPECT_EQ("0,0", root_windows[0]->GetHostOrigin().ToString()); - EXPECT_EQ("100x200", root_windows[0]->GetHostSize().ToString()); - // UpdateDisplay set the origin if it's not set. - EXPECT_NE("0,0", root_windows[1]->GetHostOrigin().ToString()); - EXPECT_EQ("300x400", root_windows[1]->GetHostSize().ToString()); - - UpdateDisplay("100x200,200+300-300x400"); - ASSERT_EQ(2, gfx::Screen::GetNumDisplays()); - EXPECT_EQ("0,0", root_windows[0]->GetHostOrigin().ToString()); - EXPECT_EQ("100x200", root_windows[0]->GetHostSize().ToString()); - EXPECT_EQ("200,300", root_windows[1]->GetHostOrigin().ToString()); - EXPECT_EQ("300x400", root_windows[1]->GetHostSize().ToString()); - - UpdateDisplay("400+500-200x300,300x400"); - ASSERT_EQ(2, gfx::Screen::GetNumDisplays()); - EXPECT_EQ("400,500", root_windows[0]->GetHostOrigin().ToString()); - EXPECT_EQ("200x300", root_windows[0]->GetHostSize().ToString()); - EXPECT_EQ("0,0", root_windows[1]->GetHostOrigin().ToString()); - EXPECT_EQ("300x400", root_windows[1]->GetHostSize().ToString()); - - UpdateDisplay("100+200-100x200,300+500-200x300"); - ASSERT_EQ(2, gfx::Screen::GetNumDisplays()); - EXPECT_EQ("100,200", root_windows[0]->GetHostOrigin().ToString()); - EXPECT_EQ("100x200", root_windows[0]->GetHostSize().ToString()); - EXPECT_EQ("300,500", root_windows[1]->GetHostOrigin().ToString()); - EXPECT_EQ("200x300", root_windows[1]->GetHostSize().ToString()); -} - } // namespace test } // namespace ash |