| Index: ui/aura/window_unittest.cc
|
| diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
|
| index 57c94057342d55e50d27c4a545d1382f279ed65b..bff18e08402231ee4056291a7a81a1918d7f60cd 100644
|
| --- a/ui/aura/window_unittest.cc
|
| +++ b/ui/aura/window_unittest.cc
|
| @@ -575,37 +575,6 @@ TEST_P(WindowTest, GetEventHandlerForPointWithOverrideDescendingOrder) {
|
| EXPECT_EQ(parent.get(), parent->GetEventHandlerForPoint(gfx::Point(50, 50)));
|
| }
|
|
|
| -TEST_P(WindowTest, GetTopWindowContainingPoint) {
|
| - Window* root = root_window();
|
| - root->SetBounds(gfx::Rect(0, 0, 300, 300));
|
| -
|
| - std::unique_ptr<Window> w1(CreateTestWindow(
|
| - SK_ColorWHITE, 1, gfx::Rect(10, 10, 100, 100), root_window()));
|
| - std::unique_ptr<Window> w11(
|
| - CreateTestWindow(SK_ColorGREEN, 11, gfx::Rect(0, 0, 120, 120), w1.get()));
|
| -
|
| - std::unique_ptr<Window> w2(
|
| - CreateTestWindow(SK_ColorRED, 2, gfx::Rect(5, 5, 55, 55), root_window()));
|
| -
|
| - std::unique_ptr<Window> w3(CreateTestWindowWithDelegate(
|
| - NULL, 3, gfx::Rect(200, 200, 100, 100), root_window()));
|
| - std::unique_ptr<Window> w31(
|
| - CreateTestWindow(SK_ColorCYAN, 31, gfx::Rect(0, 0, 50, 50), w3.get()));
|
| - std::unique_ptr<Window> w311(
|
| - CreateTestWindow(SK_ColorBLUE, 311, gfx::Rect(0, 0, 10, 10), w31.get()));
|
| -
|
| - EXPECT_EQ(NULL, root->GetTopWindowContainingPoint(gfx::Point(0, 0)));
|
| - EXPECT_EQ(w2.get(), root->GetTopWindowContainingPoint(gfx::Point(5, 5)));
|
| - EXPECT_EQ(w2.get(), root->GetTopWindowContainingPoint(gfx::Point(10, 10)));
|
| - EXPECT_EQ(w2.get(), root->GetTopWindowContainingPoint(gfx::Point(59, 59)));
|
| - EXPECT_EQ(w1.get(), root->GetTopWindowContainingPoint(gfx::Point(60, 60)));
|
| - EXPECT_EQ(w1.get(), root->GetTopWindowContainingPoint(gfx::Point(109, 109)));
|
| - EXPECT_EQ(NULL, root->GetTopWindowContainingPoint(gfx::Point(110, 110)));
|
| - EXPECT_EQ(w31.get(), root->GetTopWindowContainingPoint(gfx::Point(200, 200)));
|
| - EXPECT_EQ(w31.get(), root->GetTopWindowContainingPoint(gfx::Point(220, 220)));
|
| - EXPECT_EQ(NULL, root->GetTopWindowContainingPoint(gfx::Point(260, 260)));
|
| -}
|
| -
|
| TEST_P(WindowTest, GetToplevelWindow) {
|
| const gfx::Rect kBounds(0, 0, 10, 10);
|
| TestWindowDelegate delegate;
|
|
|