| Index: ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
|
| diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
|
| index c8efae8205be0af6997464f0837e0016d979dfa2..49d0329978bcd65a25d51a268877f123fe6735dd 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
|
| +++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
|
| @@ -199,29 +199,35 @@ TEST_F(DesktopScreenX11Test, GetPrimaryDisplay) {
|
| }
|
|
|
| TEST_F(DesktopScreenX11Test, GetWindowAtScreenPoint) {
|
| - Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(10, 10, 10, 10));
|
| - Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(50, 50, 10, 10));
|
| - Widget* window_three = BuildTopLevelDesktopWidget(gfx::Rect(15, 15, 20, 20));
|
| + Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(110, 110, 10, 10));
|
| + Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(150, 150, 10, 10));
|
| + Widget* window_three =
|
| + BuildTopLevelDesktopWidget(gfx::Rect(115, 115, 20, 20));
|
| +
|
| + window_three->Show();
|
| + window_two->Show();
|
| + window_one->Show();
|
|
|
| // Make sure the internal state of DesktopWindowTreeHostX11 is set up
|
| // correctly.
|
| ASSERT_EQ(3u, DesktopWindowTreeHostX11::GetAllOpenWindows().size());
|
|
|
| EXPECT_EQ(window_one->GetNativeWindow(),
|
| - screen()->GetWindowAtScreenPoint(gfx::Point(15, 15)));
|
| + screen()->GetWindowAtScreenPoint(gfx::Point(115, 115)));
|
| EXPECT_EQ(window_two->GetNativeWindow(),
|
| - screen()->GetWindowAtScreenPoint(gfx::Point(55, 55)));
|
| + screen()->GetWindowAtScreenPoint(gfx::Point(155, 155)));
|
| EXPECT_EQ(NULL,
|
| - screen()->GetWindowAtScreenPoint(gfx::Point(100, 100)));
|
| + screen()->GetWindowAtScreenPoint(gfx::Point(200, 200)));
|
|
|
| // Bring the third window in front. It overlaps with the first window.
|
| // Hit-testing on the intersecting region should give the third window.
|
| window_three->Activate();
|
| EXPECT_EQ(window_three->GetNativeWindow(),
|
| - screen()->GetWindowAtScreenPoint(gfx::Point(15, 15)));
|
| + screen()->GetWindowAtScreenPoint(gfx::Point(115, 115)));
|
|
|
| window_one->CloseNow();
|
| window_two->CloseNow();
|
| + window_three->CloseNow();
|
| }
|
|
|
| TEST_F(DesktopScreenX11Test, GetDisplayNearestWindow) {
|
|
|